openstack/openstack-ansible
Code Issues Proposed changes

Merge "Clarify static route requirements check"

Browse Source
This commit is contained in:
Jenkins 2016-06-01 02:58:44 +00:00 committed by Gerrit Code Review
commit 50983b0381
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/inventory/dynamic_inventory.py
View File

@ -660,11 +660,9 @@ def _add_additional_networks(key, inventory, ip_q, q_name, netmask, interface,
cidr_present = route.get('cidr', False) cidr_present = route.get('cidr', False)
gateway_present = route.get('gateway', False) gateway_present = route.get('gateway', False)
if cidr_present and gateway_present: if not (cidr_present and gateway_present):
networks[old_address]['static_routes'].append(route)
elif not cidr_present or not gateway_present:
raise MissingStaticRouteInfo(q_name) raise MissingStaticRouteInfo(q_name)
networks[old_address]['static_routes'].append(route)
def _net_address_search(provider_networks, main_network, key): def _net_address_search(provider_networks, main_network, key):