diff --git a/config.yaml b/config.yaml index d609089..677b62e 100644 --- a/config.yaml +++ b/config.yaml @@ -19,22 +19,12 @@ 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 description: | Interfaces that will provide fabric connectivity on the director nodes. - Provided in form of json in a string. These interfaces have to be connected - to the os-data-network specified in the config. Default value is MANAGEMENT which + Provided in form of json in a string. Default value is MANAGEMENT which will configure the management interface as the fabric interface on each director. network-device-mtu: diff --git a/hooks/pg_dir_utils.py b/hooks/pg_dir_utils.py index a9ba277..c97beeb 100644 --- a/hooks/pg_dir_utils.py +++ b/hooks/pg_dir_utils.py @@ -24,8 +24,6 @@ from charmhelpers.contrib.network.ip import ( get_bridges, get_bridge_nics, is_ip, - is_address_in_network, - get_iface_addr ) from charmhelpers.core.host import ( service_start, @@ -268,11 +266,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') + return node_fabric_interface else: log('Provided fabric interface %s does not exist' % node_fabric_interface)