diff options
| author | David Shrewsbury <shrewsbury.dave@gmail.com> | 2017-09-19 14:15:08 -0400 |
|---|---|---|
| committer | David Shrewsbury <shrewsbury.dave@gmail.com> | 2017-11-30 09:56:26 -0500 |
| commit | 501bd0526dad55a96cea07dce111374bbeb8f1b8 (patch) | |
| tree | 7365607f225e86d5684d35014edcbaea5ee8f452 /playbooks/zuul-stream/templates | |
| parent | 0015fda37b61da0038b5d5a627861f345fe61dc4 (diff) | |
| download | zuul-501bd0526dad55a96cea07dce111374bbeb8f1b8.tar.gz | |
Changes for Ansible 2.4
Squashed changes:
- Use 'inventory' instead of 'hostfile' in ansible.cfg.
'hostfile' is deprecated.
- Use 'os.environ.copy()' in zuul_return.py since this causes 2.4 to
throw an exception now deep within module.exit_json().
Change-Id: I0a52c9e169a54d24a7b361010045fb10211418b7
Diffstat (limited to 'playbooks/zuul-stream/templates')
| -rw-r--r-- | playbooks/zuul-stream/templates/ansible.cfg.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/zuul-stream/templates/ansible.cfg.j2 b/playbooks/zuul-stream/templates/ansible.cfg.j2 index 24f459e0e..41ffc0cea 100644 --- a/playbooks/zuul-stream/templates/ansible.cfg.j2 +++ b/playbooks/zuul-stream/templates/ansible.cfg.j2 @@ -1,5 +1,5 @@ [defaults] -hostfile = {{ ansible_user_dir }}/inventory.yaml +inventory = {{ ansible_user_dir }}/inventory.yaml gathering = smart gather_subset = !all lookup_plugins = {{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/zuul/zuul/ansible/lookup |