diff --git a/.zuul.yaml b/.zuul.yaml index ec8413dbf1..716e4452ff 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -379,9 +379,6 @@ label: ubuntu-xenial - name: bionic label: ubuntu-bionic - host-vars: - trusty: - ansible_python_interpreter: python2 files: - playbooks/.* - roles/.* diff --git a/playbooks/host_vars/trusty.yaml b/playbooks/host_vars/trusty.yaml new file mode 100644 index 0000000000..3d2c988502 --- /dev/null +++ b/playbooks/host_vars/trusty.yaml @@ -0,0 +1,3 @@ +# This is a fake host used in gate testing of the base playbook on +# each supported platform. +ansible_python_interpreter: python2 diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index e412df1c1a..5964e93f8d 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -13,6 +13,7 @@ write_inventory_dest: /etc/ansible/hosts/inventory.yaml write_inventory_exclude_hostvars: - ansible_user + - ansible_python_interpreter - name: Set up /opt/system-config repo git: repo: /home/zuul/src/opendev.org/opendev/system-config