diff options
| author | Riccardo Pittau <elfosardo@gmail.com> | 2019-10-23 12:02:51 +0200 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2019-10-24 10:02:20 +0200 |
| commit | 89c30cb923863c71a88647309cdc605b18caa777 (patch) | |
| tree | 35cf7c5382655c81580f44da4c5a011fbdd188d7 | |
| parent | 0f95848d6f8e98f4ec7d9bddec19e269daa35e28 (diff) | |
| download | ironic-89c30cb923863c71a88647309cdc605b18caa777.tar.gz | |
Using loop instead of with_X
The loop keyword is the current recommended way to handle loops,
and supports filters.
It's available since Ansible version 2.5 so changing ansible
requirement in driver-requirements.
Change-Id: Ibff1f07ca00b8f5a5274d73f9e53196f49c33a66
| -rw-r--r-- | doc/source/admin/drivers/ansible.rst | 2 | ||||
| -rw-r--r-- | driver-requirements.txt | 2 | ||||
| -rw-r--r-- | ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-loops-de0eef0d5b79a9ff.yaml | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/doc/source/admin/drivers/ansible.rst b/doc/source/admin/drivers/ansible.rst index f95b7b25f..3c1a7436c 100644 --- a/doc/source/admin/drivers/ansible.rst +++ b/doc/source/admin/drivers/ansible.rst @@ -125,7 +125,7 @@ Requirements ============ Ansible - Tested with, and targets, Ansible 2.4.x + Tested with, and targets, Ansible 2.5.x Bootstrap image requirements ---------------------------- diff --git a/driver-requirements.txt b/driver-requirements.txt index 183a3122b..c9874f12f 100644 --- a/driver-requirements.txt +++ b/driver-requirements.txt @@ -14,7 +14,7 @@ python-xclarityclient>=0.1.6 sushy>=2.0.0 # Ansible-deploy interface -ansible>=2.4 +ansible>=2.5 # HUAWEI iBMC hardware type uses the python-ibmcclient library python-ibmcclient>=0.1.0 diff --git a/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/main.yaml b/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/main.yaml index f80d5b545..20e09b4b5 100644 --- a/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/main.yaml +++ b/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/main.yaml @@ -3,7 +3,7 @@ - set_fact: ironic_root_device: /dev/{{ item.key }} - with_dict: "{{ ansible_devices }}" + loop: "{{ ansible_devices | dict2items | sort(attribute='key') }}" when: - ironic_root_device is undefined - item.value.host diff --git a/releasenotes/notes/ansible-loops-de0eef0d5b79a9ff.yaml b/releasenotes/notes/ansible-loops-de0eef0d5b79a9ff.yaml new file mode 100644 index 000000000..85f9a4085 --- /dev/null +++ b/releasenotes/notes/ansible-loops-de0eef0d5b79a9ff.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Changing minimum version of Ansible for use with the ``ansible`` + ``deploy_interface`` to version 2.5. |