From 292d719cda10380008a5e4ac249c80e1ce4fc3e5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 23 Mar 2019 18:16:43 -0400 Subject: [PATCH] Add zuul_executor_ansible support This exposes the ability for a user to managed the installation of ansible required by zuul-executors. Change-Id: I79932a99c5a4ac4dfc927d84690f165e6f0ae9c0 Depends-On: https://review.openstack.org/646025 Signed-off-by: Paul Belanger --- ansible/group_vars/zuul-executor.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/zuul-executor.yaml b/ansible/group_vars/zuul-executor.yaml index 737e7af..e34643f 100644 --- a/ansible/group_vars/zuul-executor.yaml +++ b/ansible/group_vars/zuul-executor.yaml @@ -19,7 +19,7 @@ zuul_file_zuul_executor_service_config_manage: true zuul_file_zuul_executor_service_config_src: zuul/etc/systemd/system/zuul-executor.service.d/override.conf.j2 zuul_file_zuul_executor_service_manage: true -zuul_pip_name: zuul[zuul_executor] +zuul_pip_name: zuul zuul_service_zuul_executor_enabled: true zuul_service_zuul_executor_manage: true @@ -94,3 +94,23 @@ ssh_key_private_content: | -----END RSA PRIVATE KEY----- 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 + ansible_pip_virtualenv_python: python3 + ansible_pip_virtualenv: /opt/venv/ansible-2.6 + ansible_pip_virtualenv_symlink: /opt/venv/zuul-ansible/2.6 + - ansible_pip_name: + - ansible>=2.7,<2.8 + - ara + ansible_pip_virtualenv_python: python3 + ansible_pip_virtualenv: /opt/venv/ansible-2.7 + ansible_pip_virtualenv_symlink: /opt/venv/zuul-ansible/2.7