Commit a8f0b5fd by Michael DeHaan

Fix playbooks such that they work with external inventory scripts. We really…

Fix playbooks such that they work with external inventory scripts.  We really want to find out why the 'all'
group isn't available, but group vars don't make sense for external inventory anyway.
parent 25637716
...@@ -108,12 +108,13 @@ class PlayBook(object): ...@@ -108,12 +108,13 @@ class PlayBook(object):
if override_hosts is not None: if override_hosts is not None:
if type(override_hosts) != list: if type(override_hosts) != list:
raise errors.AnsibleError("override hosts must be a list") raise errors.AnsibleError("override hosts must be a list")
self.global_vars.update(ansible.inventory.Inventory(host_list).get_group_variables('all')) if not self.inventory._is_script:
self.inventory = ansible.inventory.Inventory(override_hosts) self.global_vars.update(ansible.inventory.Inventory(host_list).get_group_variables('all'))
else: else:
self.inventory = ansible.inventory.Inventory(host_list) self.inventory = ansible.inventory.Inventory(host_list)
self.global_vars.update(ansible.inventory.Inventory(host_list).get_group_variables('all')) if not self.inventory._is_script:
self.global_vars.update(ansible.inventory.Inventory(host_list).get_group_variables('all'))
self.basedir = os.path.dirname(playbook) self.basedir = os.path.dirname(playbook)
self.playbook = self._parse_playbook(playbook) self.playbook = self._parse_playbook(playbook)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment