L3 fabric changes
This commit is contained in:
commit
a3da099ebe
|
@ -13,15 +13,6 @@ options:
|
||||||
type: string
|
type: string
|
||||||
default: 'juju-br0'
|
default: 'juju-br0'
|
||||||
description: The interface connected to PLUMgrid Managment network.
|
description: The interface connected to PLUMgrid Managment network.
|
||||||
os-data-network:
|
|
||||||
type: string
|
|
||||||
default:
|
|
||||||
description: |
|
|
||||||
The IP address and netmask of the OpenStack Data network (e.g.,
|
|
||||||
192.168.0.0/24)
|
|
||||||
.
|
|
||||||
This network will be used for tenant network traffic in overlay
|
|
||||||
networks.
|
|
||||||
fabric-interfaces:
|
fabric-interfaces:
|
||||||
default: 'MANAGEMENT'
|
default: 'MANAGEMENT'
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -268,11 +268,7 @@ def get_fabric_interface():
|
||||||
else:
|
else:
|
||||||
raise ValueError('No fabric interface provided for node')
|
raise ValueError('No fabric interface provided for node')
|
||||||
if interface_exists(node_fabric_interface):
|
if interface_exists(node_fabric_interface):
|
||||||
if is_address_in_network(config('os-data-network'),
|
return node_fabric_interface
|
||||||
get_iface_addr(node_fabric_interface)[0]):
|
|
||||||
return node_fabric_interface
|
|
||||||
else:
|
|
||||||
raise ValueError('Fabric interface not in fabric network')
|
|
||||||
else:
|
else:
|
||||||
log('Provided fabric interface %s does not exist'
|
log('Provided fabric interface %s does not exist'
|
||||||
% node_fabric_interface)
|
% node_fabric_interface)
|
||||||
|
|
|
@ -4,4 +4,3 @@
|
||||||
{{ dev }} = access_phys
|
{{ dev }} = access_phys
|
||||||
{% endfor -%}
|
{% endfor -%}
|
||||||
{% endif -%}
|
{% endif -%}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue