zuul/zuul-jobs
Code Issues Proposed changes

Fix evaluating nodepool_ip and switch_ip facts

Browse Source 
In I32fb17bae98f13f735da4d5b9a6a01e948f21678, the evaluated facts
should also fallback to public_ipv4, when private_ipv4 is "empty-like",
e.g. contains no valid IP but something like '\n'.

It also restores the lost switch_private_ip fact just in case.

Change-Id: I139272746129213994f298a4a9178b4441d439af
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2019-09-10 10:46:49 +02:00
parent b87fadb06d
commit db6677a867
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
roles/multi-node-bridge/tasks/peer.yaml
View File

@ -9,20 +9,31 @@
vni: "{{ offset | int + bridge_vni_offset | int }}" vni: "{{ offset | int + bridge_vni_offset | int }}"
# To make things more readable in the following tasks # To make things more readable in the following tasks
- name: Set ip address when the node private IP is not set - name: Set ip address when the node private IP looks empty
set_fact:
nodepool_ip: "{{ nodepool.public_ipv4 }}"
when: not (nodepool.private_ipv4 | ipv4)
- name: Set ip address when the node private IP was not defined
set_fact: set_fact:
nodepool_ip: | nodepool_ip: |
{{ nodepool.private_ipv4 | default(nodepool.public_ipv4) }} {{ nodepool.private_ipv4 | default(nodepool.public_ipv4) }}
when: nodepool_ip is not defined
- name: Select the switch from group - name: Select the switch from group and the private ip
set_fact: set_fact:
switch: "{{ groups['switch'][0] }}" switch: "{{ groups['switch'][0] }}"
switch_private_ip: "{{ hostvars[groups['switch'][0]].nodepool.private_ipv4 }}"
- name: Alias the primary node private IP - name: Alias the primary node private IP, if it looks empty
set_fact: set_fact:
switch_ip: | switch_ip: "{{ hostvars[switch].nodepool.public_ipv4 }}"
{{ hostvars[switch].nodepool.private_ipv4 | when: not (switch_private_ip | ipv4)
default(hostvars[switch].nodepool.public_ipv4) }}
- name: Alias the primary node private IP, if it was not defined
set_fact:
switch_ip: "{{ switch_private_ip | default(hostvars[switch].nodepool.public_ipv4) }}"
when: switch_ip is not defined
- name: Add port to bridge on switch node - name: Add port to bridge on switch node
become: yes become: yes