From 6030e20dc800cde3563c0952e761cccd293703d1 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 16 Jan 2020 12:58:29 -0500 Subject: [PATCH] Drop ansible-2.6 and add ansible-2.9 for zuul-executors Zuul has EOL'd ansible 2.6 and added ansible 2.9 support. Update our playbooks to support that too. Depends-On: https://review.opendev.org/724362 Change-Id: Ibaaabcf56a43ee4d323ca0a9ca98ce48d1873d90 Signed-off-by: Paul Belanger --- .yamllint | 1 + ansible/group_vars/zuul-executor.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.yamllint b/.yamllint index 2ceb272..6f0d12b 100644 --- a/.yamllint +++ b/.yamllint @@ -1,3 +1,4 @@ +--- extends: default ignore: | diff --git a/ansible/group_vars/zuul-executor.yaml b/ansible/group_vars/zuul-executor.yaml index cb4271b..977454d 100644 --- a/ansible/group_vars/zuul-executor.yaml +++ b/ansible/group_vars/zuul-executor.yaml @@ -94,12 +94,6 @@ ssh_key_private_content: | ssh_key_private_dest: "{{ ssh_user_home }}/.ssh/nodepool_id_rsa" zuul_executor_ansible: - - ansible_pip_name: - - ansible>=2.5,<2.6 - - ara - ansible_pip_virtualenv_python: python3 - ansible_pip_virtualenv: /opt/venv/ansible-2.5 - ansible_pip_virtualenv_symlink: /opt/venv/zuul-ansible/2.5 - ansible_pip_name: - ansible>=2.6,<2.7 - ara @@ -118,3 +112,9 @@ zuul_executor_ansible: ansible_pip_virtualenv_python: python3 ansible_pip_virtualenv: /opt/venv/ansible-2.8 ansible_pip_virtualenv_symlink: /opt/venv/zuul-ansible/2.8 + - ansible_pip_name: + - ansible>=2.9,<2.10 + - ara + ansible_pip_virtualenv_python: python3 + ansible_pip_virtualenv: /opt/venv/ansible-2.9 + ansible_pip_virtualenv_symlink: /opt/venv/zuul-ansible/2.9