L3 fabric changes

config.yaml

@@ -13,22 +13,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 gateway 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:

hooks/pg_gw_utils.py

@@ -23,8 +23,6 @@ from charmhelpers.contrib.network.ip import (
     get_iface_from_addr,
     get_bridges,
     get_bridge_nics,
-    is_address_in_network,
-    get_iface_addr
 )
 from charmhelpers.core.host import (
     write_file,
@@ -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)

templates/kilo/ifcs.conf

@@ -4,4 +4,3 @@
 {{ dev }} = access_phys
 {% endfor -%}
 {% endif -%}
-