Merge lp:~bbaqar/charms/trusty/plumgrid-gateway/ext-interface-static into lp:~junaidali/charms/trusty/plumgrid-gateway/trunk

[Junaid Ali]

=== modified file 'hooks/pg_gw_utils.py'
--- hooks/pg_gw_utils.py	2016-05-23 10:31:14 +0000
+++ hooks/pg_gw_utils.py	2016-06-09 17:28:49 +0000
@@ -285,22 +285,12 @@
     Gateway node can have multiple interfaces. This function parses json
     provided in config to get all gateway interfaces for this node.
     '''
-    node_interfaces = []
-    try:
-        all_interfaces = json.loads(config('external-interfaces'))
-    except ValueError:
-        raise ValueError("Invalid json provided for gateway interfaces")
-    hostname = get_unit_hostname()
-    if hostname in all_interfaces:
-        node_interfaces = all_interfaces[hostname].split(',')
-    elif 'DEFAULT' in all_interfaces:
-        node_interfaces = all_interfaces['DEFAULT'].split(',')
-    for interface in node_interfaces:
-        if not interface_exists(interface):
-            log('Provided gateway interface %s does not exist'
-                % interface)
-            raise ValueError('Provided gateway interface does not exist')
-    return node_interfaces
+    interface = config('external-interfaces')
+    if not interface_exists(interface):
+        log('Provided gateway interface %s does not exist'
+            % interface)
+        raise ValueError('Provided gateway interface does not exist')
+    return interface
 
 
 def ensure_mtu():
 
=== modified file 'templates/kilo/ifcs.conf'
--- templates/kilo/ifcs.conf	2016-05-21 11:54:18 +0000
+++ templates/kilo/ifcs.conf	2016-06-09 17:28:49 +0000
@@ -1,7 +1,11 @@
 {{ fabric_interface }} = fabric_core host
+<<<<<<< TREE
 {% if ext_interfaces -%}
 {% for dev in ext_interfaces -%}
 {{ dev }} = access_phys
 {% endfor -%}
 {% endif -%}
+=======
+{{ ext_interfaces }} = access_phys
+>>>>>>> MERGE-SOURCE