summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-03 21:18:21 +0000
committerGerrit Code Review <review@openstack.org>2019-08-03 21:18:21 +0000
commitb69fbbd65c6fca89309d49885560ec38501bf1c5 (patch)
tree73f6f6bc5ad502ac6b2b43c71018d6d5eed4e9b8
parentd42b4c7c8cad37165e80257830fae3c9dc7ba88c (diff)
parent1b27bb71512c25a4fb2f38d09d623ec98974896a (diff)
downloadironic-b69fbbd65c6fca89309d49885560ec38501bf1c5.tar.gz
Merge "Fix serial/wwn gathering for ansible+python3" into stable/stein
-rw-r--r--ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/roothints.yaml2
-rw-r--r--releasenotes/notes/bug-2006266-85da234583ca0c32.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/roothints.yaml b/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/roothints.yaml
index 488a21813..d150754b8 100644
--- a/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/roothints.yaml
+++ b/ironic/drivers/modules/ansible/playbooks/roles/discover/tasks/roothints.yaml
@@ -1,6 +1,6 @@
- name: get devices wwn facts
facts_wwn:
- devices: "{{ ansible_devices.keys() }}"
+ devices: "{{ ansible_devices.keys() | list }}"
- name: calculate root hint
root_hints:
diff --git a/releasenotes/notes/bug-2006266-85da234583ca0c32.yaml b/releasenotes/notes/bug-2006266-85da234583ca0c32.yaml
new file mode 100644
index 000000000..c741a1081
--- /dev/null
+++ b/releasenotes/notes/bug-2006266-85da234583ca0c32.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ An issue regarding the ``ansible`` deploy interface. The discovery
+ playbook used to gather wwn and serials was broken for python3 due to the
+ dict().keys() object not being a list in python3.