diff --git a/ansible/kolla-ansible.yml b/ansible/kolla-ansible.yml index 50481f5a5..836db348a 100644 --- a/ansible/kolla-ansible.yml +++ b/ansible/kolla-ansible.yml @@ -1,4 +1,9 @@ --- +- name: Gather facts for localhost + hosts: localhost + gather_facts: true + tags: always + - name: Set interfaces for overcloud hosts hosts: overcloud tags: @@ -213,7 +218,7 @@ hosts: localhost tags: - kolla-ansible - gather_facts: true + gather_facts: false vars: # We need to reference configuration for the network node. # We pick the first host from the group for this. It is possible that at diff --git a/ansible/roles/kolla-ansible/templates/requirements.txt.j2 b/ansible/roles/kolla-ansible/templates/requirements.txt.j2 index 2bb512391..dd71d6676 100644 --- a/ansible/roles/kolla-ansible/templates/requirements.txt.j2 +++ b/ansible/roles/kolla-ansible/templates/requirements.txt.j2 @@ -7,7 +7,7 @@ kolla-ansible=={{ kolla_openstack_release }} {% endif %} # Limit the version of ansible used by kolla-ansible to avoid new releases from # breaking tested code. Changes to this limit should be tested. -ansible>=2.5,<2.8 +ansible>=2.6,<2.9 {% if kolla_ansible_venv_extra_requirements is defined %} {% for item in kolla_ansible_venv_extra_requirements %} {{ item }} diff --git a/releasenotes/notes/ansible-2.6-2.8-ce141db0edb87e1c.yaml b/releasenotes/notes/ansible-2.6-2.8-ce141db0edb87e1c.yaml new file mode 100644 index 000000000..99c962110 --- /dev/null +++ b/releasenotes/notes/ansible-2.6-2.8-ce141db0edb87e1c.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Updates the minimum supported version of Ansible from 2.5 to 2.6, and the + maximum supported version from 2.7 to 2.8. This is true for both Kayobe and + Kolla Ansible. diff --git a/requirements.txt b/requirements.txt index bc45e2bee..a368d2664 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. pbr>=2.0 # Apache-2.0 -ansible>=2.5.0,<2.8.0 # GPLv3 +ansible>=2.6.0,<2.9.0 # GPLv3 cliff>=2.5.0,<2.15.0 # Apache netaddr!=0.7.16,>=0.7.13 # BSD PyYAML>=3.10.0 # MIT diff --git a/requirements.yml b/requirements.yml index cbb3d63b4..d0b730727 100644 --- a/requirements.yml +++ b/requirements.yml @@ -34,7 +34,7 @@ - src: stackhpc.os-ironic-state version: v1.2.0 - src: stackhpc.os-networks - version: v1.2.0 + version: v1.3.1 - src: stackhpc.os-openstackclient version: v1.3.0 - src: stackhpc.os-shade