x/charm-plumgrid-edge
Code Issues Proposed changes

L3 fabric changes

Browse Source
This commit is contained in:
Junaid Ali 2016-06-16 11:56:59 +05:00
commit fe24970621
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.yaml
View File

@ -19,15 +19,6 @@ options:
type: string
default: 'juju-br0'
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:
default: 'MANAGEMENT'
type: string

4
hooks/pg_dir_utils.py
View File

@ -268,11 +268,7 @@ def get_fabric_interface():
else:
raise ValueError('No fabric interface provided for node')
if interface_exists(node_fabric_interface):
if is_address_in_network(config('os-data-network'),
get_iface_addr(node_fabric_interface)[0]):
return node_fabric_interface
else:
raise ValueError('Fabric interface not in fabric network')
else:
log('Provided fabric interface %s does not exist'
% node_fabric_interface)