openstack/kolla-ansible
Code Issues Proposed changes

Reorder the interface/network checks.

Browse Source 
Perform the interface specific checks first, then do the network
related checks (not the other way around)

TrivialFix

Change-Id: Iae2c9fb9491060f1e33f067c08d22479108c3c98
This commit is contained in:
James McCarthy 2016-10-14 09:52:47 +01:00
parent dbf05f076f
commit 64e6e58627
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ansible/roles/prechecks/tasks/port_checks.yml
View File

@ -633,6 +633,22 @@
state: stopped
when: inventory_hostname in groups['haproxy']
- name: Checking the network_interface is present
fail: "msg='Please check the network_interface property - interface {{ network_interface }} not found'"
when: network_interface not in ansible_interfaces
- name: Checking the network_interface is active
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} is not active'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['active'] != True
- name: Checking the network_interface configuration
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} configuration missing'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4'] is not defined
- name: Checking the network_interface ip address configuration
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} ip address problem'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] is not defined
- name: Checking if kolla_internal_vip_address and kolla_external_vip_address are not pingable from any node
command: ping -c 3 {{ item }}
register: ping_output
@ -650,19 +666,3 @@
failed_when: "'169.254.' not in kolla_internal_vip_address and \
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none"
when: enable_haproxy | bool
- name: Checking the network_interface is present
fail: "msg='Please check the network_interface property - interface {{ network_interface }} not found'"
when: network_interface not in ansible_interfaces
- name: Checking the network_interface is active
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} is not active'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['active'] != True
- name: Checking the network_interface configuration
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} configuration missing'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4'] is not defined
- name: Checking the network_interface ip address configuration
fail: "msg='Please check the network_interface settings - interface {{ network_interface }} ip address problem'"
when: hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] is not defined