openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Fix Jinja2's default filter usage"

This commit is contained in:
Zuul 2019-05-15 09:16:49 +00:00 committed by Gerrit Code Review
parent 90a35760e2 d483ace379
commit cec7b84484
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/check-network-gateway/tasks/main.yml
View File

@ -33,8 +33,8 @@
- name: Test network_gateway if different from local_ip
icmp_ping:
host: "{{ gateway.value | default('0.0.0.0') }}"
host: "{{ gateway.value | default('0.0.0.0', true) }}"
when: >
"local_ip.value | default('0.0.0.0') | ipaddr('address')"
"local_ip.value | default('0.0.0.0', true) | ipaddr('address')"
!=
"gateway.value | default('0.0.0.0') | ipaddr('address')"
"gateway.value | default('0.0.0.0', true) | ipaddr('address')"

4
roles/ctlplane-ip-range/tasks/main.yml
View File

@ -24,6 +24,6 @@
- name: Check the size of the DHCP range for overcloud nodes
ip_range:
start: "{{ dhcp_start.value|default('192.0.2.5') }}"
end: "{{ dhcp_end.value|default('192.0.2.24') }}"
start: "{{ dhcp_start.value|default('192.0.2.5', true) }}"
end: "{{ dhcp_end.value|default('192.0.2.24', true) }}"
min_size: "{{ ctlplane_iprange_min_size }}"

2
roles/dhcp-validations/tasks/dhcp-provisioning.yaml
View File

@ -11,4 +11,4 @@
register: local_interface
- name: Look for DHCP responses
script: files/rogue_dhcp.py {{ local_interface.value|default('eth1') }}
script: files/rogue_dhcp.py {{ local_interface.value|default('eth1', true) }}