Merge lp:~junaidali/charms/trusty/plumgrid-director/trunk into lp:~plumgrid-team/charms/trusty/plumgrid-director/trunk

[Junaid Ali]

[lp:~junaidali/charms/trusty/plumgrid-director/trunk]

35. By Junaid Ali on 2016-06-19

Changes:
 Updated fabric-interfaces config description
 Removed unused imports

[Bilal Baqar (bbaqar)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2016-05-04 06:47:43 +0000
+++ config.yaml	2016-06-19 18:53:40 +0000
@@ -19,22 +19,12 @@
     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:
 
=== modified file 'hooks/pg_dir_utils.py'
--- hooks/pg_dir_utils.py	2016-05-23 10:29:42 +0000
+++ hooks/pg_dir_utils.py	2016-06-19 18:53:40 +0000
@@ -24,8 +24,6 @@
     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 @@
         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)