From: David Galloway Date: Wed, 16 Nov 2016 20:34:25 +0000 (-0500) Subject: downstream_setup: Dynamically evaluate when statements in main.yml X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=088d01a0658b4784f0b2dfbe58ed04ad1a13323e;p=ceph-cm-ansible.git downstream_setup: Dynamically evaluate when statements in main.yml See https://github.com/ansible/ansible/issues/18483 Signed-off-by: David Galloway --- diff --git a/roles/downstream-setup/tasks/main.yml b/roles/downstream-setup/tasks/main.yml index 31b67c8..b01338a 100644 --- a/roles/downstream-setup/tasks/main.yml +++ b/roles/downstream-setup/tasks/main.yml @@ -1,9 +1,13 @@ --- +# re: 'static: no' -- See https://github.com/ansible/ansible/issues/18483 +# Can be removed once that fix makes it into Ansible + # These are tasks which perform actions corresponding to the names of # the variables they use. For example, `disable_yum_repos` would actually # disable all repos defined in that list. - include: setup.yml when: not cleanup and (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") + static: no # These are tasks which reverse the actions corresponding to the names of # the variables they use. For example, `disable_yum_repos` would actually @@ -12,3 +16,4 @@ # for the test run but then re-enable them during the teuthology cleanup process. - include: cleanup.yml when: cleanup and (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") + static: no