From 68ed2960e30ac352e519cd7816eafea751dd898c Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Tue, 21 Jan 2020 15:55:42 +0100 Subject: [PATCH] Set Ansible default version to 2.8 Ansible 2.6 is EOL, we should move to a more recent release that has better support for Python 3.x and, above all, is maintained with security and critical bug fixes. Change-Id: I6aa80b4bc4a0c34ac919951cd940b2fc6b736bdc --- playbooks/test-bifrost.yaml | 4 ++-- .../notes/default-ansible2.8-e0000544b2f55b88.yaml | 7 +++++++ scripts/env-setup.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/default-ansible2.8-e0000544b2f55b88.yaml diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml index 7743ea3c5..bf7baee98 100644 --- a/playbooks/test-bifrost.yaml +++ b/playbooks/test-bifrost.yaml @@ -111,12 +111,12 @@ command: openstack baremetal node list environment: OS_CLOUD: bifrost - PATH: /usr/local/bin:{{ ansible.env.PATH }} + PATH: /usr/local/bin:{{ ansible_env.PATH }} - name: "List introspection rules using openstack client" command: openstack baremetal introspection rule list environment: OS_CLOUD: "{% if enable_keystone | default(false) | bool == true %}bifrost{% else %}bifrost-inspector{% endif %}" - PATH: /usr/local/bin:{{ ansible.env.PATH }} + PATH: /usr/local/bin:{{ ansible_env.PATH }} when: enable_inspector is defined and enable_inspector | bool - hosts: baremetal diff --git a/releasenotes/notes/default-ansible2.8-e0000544b2f55b88.yaml b/releasenotes/notes/default-ansible2.8-e0000544b2f55b88.yaml new file mode 100644 index 000000000..7888537e6 --- /dev/null +++ b/releasenotes/notes/default-ansible2.8-e0000544b2f55b88.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + The default version of Ansible becomes 2.8, replacing version 2.6 + that is EOL. + This version guarantees full bug fix and security patches and has + a better support for Python 3.x. + diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh index 131307486..4d4e21316 100755 --- a/scripts/env-setup.sh +++ b/scripts/env-setup.sh @@ -5,7 +5,7 @@ set -eu # NOTE(pas-ha) the above exports some useful variables like # $PYTHON , $PIP and $VENV depending on venv install or not -ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${ANSIBLE_GIT_BRANCH:-stable-2.6}} +ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-${ANSIBLE_GIT_BRANCH:-stable-2.8}} ANSIBLE_PIP_STRING=$(${PYTHON} $(dirname $0)/ansible-pip-str.py ${ANSIBLE_PIP_VERSION})