From 05f5734053693a73088bf0a7955a098d42ba95ec Mon Sep 17 00:00:00 2001 From: John Kleint Date: Thu, 31 May 2012 16:06:21 -0400 Subject: [PATCH] Properly template list of hosts in playbooks. In playbooks, hosts can be a YAML list. We templated the list before converting it to a semicolon-separated string, which actually templated its repr. This converts to a string first. A basic unit test is included. --- lib/ansible/playbook/play.py | 14 ++++++++------ test/TestPlayBook.py | 13 +++++++++++++ test/hosts_list.yml | 5 +++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 test/hosts_list.yml diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index f884dda9c55..82fbc41d626 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -37,10 +37,16 @@ class Play(object): # TODO: more error handling + hosts = ds.get('hosts') + if hosts is None: + raise errors.AnsibleError('hosts declaration is required') + elif isinstance(hosts, list): + hosts = ';'.join(hosts) + hosts = utils.template(hosts, playbook.extra_vars, {}) + self._ds = ds self.playbook = playbook - self.hosts = ds.get('hosts', None) - self.hosts = utils.template(self.hosts, self.playbook.extra_vars, {}) + self.hosts = hosts self.name = ds.get('name', self.hosts) self.vars = ds.get('vars', {}) self.vars_files = ds.get('vars_files', []) @@ -56,10 +62,6 @@ class Play(object): self._tasks = self._load_tasks(self._ds, 'tasks') self._handlers = self._load_tasks(self._ds, 'handlers') - if self.hosts is None: - raise errors.AnsibleError('hosts declaration is required') - if isinstance(self.hosts, list): - self.hosts = ';'.join(self.hosts) if self.sudo_user != 'root': self.sudo = True diff --git a/test/TestPlayBook.py b/test/TestPlayBook.py index c8c2eea4105..ec72f261e13 100644 --- a/test/TestPlayBook.py +++ b/test/TestPlayBook.py @@ -172,3 +172,16 @@ class TestPlaybook(unittest.TestCase): print data assert data.find("ears") != -1, "template success" + def test_yaml_hosts_list(self): + # Make sure playbooks support hosts: [host1, host2] + # TODO: Actually run the play on more than one host + test_callbacks = TestCallbacks() + playbook = ansible.playbook.PlayBook( + playbook=os.path.join(self.test_dir, 'hosts_list.yml'), + host_list='test/ansible_hosts', + stats=ans_callbacks.AggregateStats(), + callbacks=test_callbacks, + runner_callbacks=test_callbacks + ) + play = ansible.playbook.Play(playbook, playbook.playbook[0]) + assert play.hosts == ';'.join(('host1', 'host2', 'host3')) diff --git a/test/hosts_list.yml b/test/hosts_list.yml new file mode 100644 index 00000000000..458cee7a92a --- /dev/null +++ b/test/hosts_list.yml @@ -0,0 +1,5 @@ +# Test that playbooks support YAML lists of hosts. +--- +- hosts: [host1, host2, host3] + tasks: + - action: command true