diff --git a/config.yaml b/config.yaml index 07e7676..1f53ed3 100644 --- a/config.yaml +++ b/config.yaml @@ -13,15 +13,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 diff --git a/hooks/pg_gw_utils.py b/hooks/pg_gw_utils.py index cb9250e..5582b3c 100644 --- a/hooks/pg_gw_utils.py +++ b/hooks/pg_gw_utils.py @@ -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') + return node_fabric_interface else: log('Provided fabric interface %s does not exist' % node_fabric_interface) diff --git a/templates/kilo/ifcs.conf b/templates/kilo/ifcs.conf index e7535cb..88c7091 100644 --- a/templates/kilo/ifcs.conf +++ b/templates/kilo/ifcs.conf @@ -4,4 +4,3 @@ {{ dev }} = access_phys {% endfor -%} {% endif -%} -