internet/ansible-collections-openstack
3
0
Fork 0
mirror of https://opendev.org/openstack/ansible-collections-openstack.git synced 2026-03-26 21:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "fix constructed compose"

Browse Source
This commit is contained in:
Zuul
2020-02-27 23:38:05 +00:00
committed by Gerrit Code Review
parent bb73bafd9a 7d46ce9c51
commit 584220fdd3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/inventory/openstack.py
View File

@@ -256,24 +256,26 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
def _set_variables(self, hostvars, groups): def _set_variables(self, hostvars, groups):
strict = self.get_option('strict')
# set vars in inventory from hostvars # set vars in inventory from hostvars
for host in hostvars: for host in hostvars:
# create composite vars
self._set_composite_vars(
self._config_data.get('compose'), hostvars[host], host)
# actually update inventory # actually update inventory
for key in hostvars[host]: for key in hostvars[host]:
self.inventory.set_variable(host, key, hostvars[host][key]) self.inventory.set_variable(host, key, hostvars[host][key])
# create composite vars
self._set_composite_vars(
self._config_data.get('compose'), self.inventory.get_host(host).get_vars(), host, strict)
# constructed groups based on conditionals # constructed groups based on conditionals
self._add_host_to_composed_groups( self._add_host_to_composed_groups(
self._config_data.get('groups'), hostvars[host], host) self._config_data.get('groups'), hostvars[host], host, strict)
# constructed groups based on jinja expressions # constructed groups based on jinja expressions
self._add_host_to_keyed_groups( self._add_host_to_keyed_groups(
self._config_data.get('keyed_groups'), hostvars[host], host) self._config_data.get('keyed_groups'), hostvars[host], host, strict)
for group_name, group_hosts in groups.items(): for group_name, group_hosts in groups.items():
gname = self.inventory.add_group(group_name) gname = self.inventory.add_group(group_name)