openstack
/
kayobe
Code Issues Proposed changes

Merge "Fixes for Ansible 2.10"

This commit is contained in:
Zuul 2021-05-13 11:20:52 +00:00 committed by Gerrit Code Review
parent bc4c16f004 c44f4815cf
commit 928d0a5cb3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/provision-net.yml
View File

@ -89,7 +89,7 @@
- block:
- name: Gather facts about provisioning network
os_networks_facts:
os_networks_info:
auth: "{{ openstack_auth }}"
auth_type: "{{ openstack_auth_type }}"
cacert: "{{ openstack_cacert | default(omit, true) }}"
@ -100,7 +100,7 @@
- name: Set provisioning network to unshared
command: "{{ venv }}/bin/openstack network set {{ provision_net.name }} --no-share"
changed_when: true
when: openstack_networks[0].shared
when: provisioning_network_facts.openstack_networks[0].shared
environment: "{{ openstack_auth_env }}"
vars:
ansible_python_interpreter: "{{ venv }}/bin/python"
@ -108,7 +108,7 @@
- block:
- name: Gather facts about cleaning network
os_networks_facts:
os_networks_info:
auth: "{{ openstack_auth }}"
auth_type: "{{ openstack_auth_type }}"
cacert: "{{ openstack_cacert | default(omit, true) }}"
@ -119,7 +119,7 @@
- name: Set cleaning network to unshared
command: "{{ venv }}/bin/openstack network set {{ cleaning_net.name }} --no-share"
changed_when: true
when: openstack_networks[0].shared
when: cleaning_network_facts.openstack_networks[0].shared
environment: "{{ openstack_auth_env }}"
vars:
ansible_python_interpreter: "{{ venv }}/bin/python"

6
ansible/roles/ipa-images/tasks/set-driver-info.yml
View File

@ -1,7 +1,7 @@
---
- name: Retrieve deployment image uuids
os_image_facts:
os_image_info:
auth_type: "{{ ipa_images_openstack_auth_type }}"
auth: "{{ ipa_images_openstack_auth }}"
cacert: "{{ ipa_images_openstack_cacert | default(omit, true) }}"
@ -14,11 +14,11 @@
- name: Set fact containing kernel uuid
set_fact:
ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].ansible_facts.openstack_image.id }}"
ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].openstack_image.id }}"
- name: Set fact containing ramdisk uuid
set_fact:
ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].ansible_facts.openstack_image.id }}"
ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].openstack_image.id }}"
- name: Get a list of ironic nodes
command: |