diff options
| -rw-r--r-- | ansible/roles/nova-cell/tasks/wait_discover_computes.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 4 | ||||
| -rw-r--r-- | doc/source/conf.py | 8 | ||||
| -rw-r--r-- | lint-requirements.txt | 2 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-2.20-5dde80ced4385201.yaml | 5 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 6 |
8 files changed, 19 insertions, 14 deletions
diff --git a/ansible/roles/nova-cell/tasks/wait_discover_computes.yml b/ansible/roles/nova-cell/tasks/wait_discover_computes.yml index b8cb6b7fe..54ed88b07 100644 --- a/ansible/roles/nova-cell/tasks/wait_discover_computes.yml +++ b/ansible/roles/nova-cell/tasks/wait_discover_computes.yml @@ -74,8 +74,8 @@ {{ expected_compute_service_hosts | difference(nova_compute_service_hosts) | list }} # Whether any compute services failed on this host. any_failed_services: >- - {{ ansible_facts.nodename in failed_compute_service_hosts or - (ansible_facts.hostname ~ "-ironic") in failed_compute_service_hosts }} + {{ (ansible_facts.nodename | default()) in failed_compute_service_hosts or + ((ansible_facts.hostname | default()) ~ "-ironic") in failed_compute_service_hosts }} fail: msg: >- The Nova compute service failed to register itself on the following diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 069d89d84..ea61b14a6 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -1,8 +1,8 @@ --- docker_version_min: '18.09' docker_py_version_min: '3.4.1' -ansible_version_min: '2.18' -ansible_version_max: '2.19' +ansible_version_min: '2.19' +ansible_version_max: '2.20' # Top level keys should match ansible_facts.distribution. # These map to lists of supported releases (ansible_facts.distribution_release) or diff --git a/doc/source/conf.py b/doc/source/conf.py index 785cb15e2..af435eeb3 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -142,10 +142,10 @@ else: TESTED_RUNTIMES_GOVERNANCE_URL =\ 'https://governance.openstack.org/tc/reference/runtimes/{}.html'.format(KOLLA_OPENSTACK_RELEASE) -ANSIBLE_CORE_VERSION_MIN = '2.18' -ANSIBLE_CORE_VERSION_MAX = '2.19' -ANSIBLE_VERSION_MIN = '11' -ANSIBLE_VERSION_MAX = '12' +ANSIBLE_CORE_VERSION_MIN = '2.19' +ANSIBLE_CORE_VERSION_MAX = '2.20' +ANSIBLE_VERSION_MIN = '12' +ANSIBLE_VERSION_MAX = '13' GLOBAL_VARIABLE_MAP = { '|ANSIBLE_CORE_VERSION_MIN|': ANSIBLE_CORE_VERSION_MIN, diff --git a/lint-requirements.txt b/lint-requirements.txt index 9149f3737..a7adc68a3 100644 --- a/lint-requirements.txt +++ b/lint-requirements.txt @@ -1,4 +1,4 @@ -ansible>=10,<12 # GPLv3 +ansible>=12,<14 # GPLv3 ansible-lint<26 # MIT bandit>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 diff --git a/releasenotes/notes/ansible-2.20-5dde80ced4385201.yaml b/releasenotes/notes/ansible-2.20-5dde80ced4385201.yaml new file mode 100644 index 000000000..1d70992bc --- /dev/null +++ b/releasenotes/notes/ansible-2.20-5dde80ced4385201.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Minimum supported Ansible version is now ``12`` (ansible-core 2.19) + and maximum supported is ``13`` (ansible-core 2.20). diff --git a/requirements.txt b/requirements.txt index bf2591b8e..99ac763ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ hvac>=0.10.1 # Apache-2.0 Jinja2>=3 # BSD License (3 clause) # Ansible and ansible's json_query -ansible-core>=2.18,!=2.19.0,<2.20; python_version >= '3.11' # GPLv3 +ansible-core>=2.19,!=2.19.0,<2.21 # GPLv3 jmespath>=0.9.3 # MIT # ini parsing diff --git a/test-requirements.txt b/test-requirements.txt index 8451a2b90..85a3dc193 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,7 @@ hvac>=0.10.1 # Apache-2.0 Jinja2>=3 # BSD License (3 clause) # Ansible and ansible's json_query -ansible-core>=2.18,!=2.19.0,<2.20; python_version >= '3.11' # GPLv3 +ansible-core>=2.19,!=2.19.0,<2.21 # GPLv3 jmespath>=0.9.3 # MIT # ini parsing diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index e5419fbc4..05bd823d6 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -51,9 +51,9 @@ ansible_core_version_constraint: >- {{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if is_upgrade or ansible_facts.distribution != "Ubuntu" else ansible_core_version_max }} - ansible_core_version_slurp: "==2.17.*" - ansible_core_version_max: "==2.19.*" - ansible_core_version_min: "==2.18.*" + ansible_core_version_slurp: "==2.18.*" + ansible_core_version_max: "==2.20.*" + ansible_core_version_min: "==2.19.*" # NOTE(mgoddard): Test the use of interface names with dashes. api_interface_name: "vxlan-0" api_network_prefix: "192.0.2." |