summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunaid Ali <junaidali@plumgrid.com>2016-06-16 12:02:23 +0500
committerJunaid Ali <junaidali@plumgrid.com>2016-06-16 12:02:23 +0500
commita3da099ebec1281a4acb3868274ea824228908ef (patch)
tree3681ece4f6fb52a1a47f5e62c56db4347b2f9e13
parent03c379164be1f8ab10512fccd734e63cda3a3de7 (diff)
parent50e520dce78913d304d4757c975bfe34faf2f294 (diff)
L3 fabric changes
-rw-r--r--config.yaml9
-rw-r--r--hooks/pg_gw_utils.py6
-rw-r--r--templates/kilo/ifcs.conf1
3 files changed, 1 insertions, 15 deletions
diff --git a/config.yaml b/config.yaml
index 07e7676..1f53ed3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -13,15 +13,6 @@ options:
13 type: string 13 type: string
14 default: 'juju-br0' 14 default: 'juju-br0'
15 description: The interface connected to PLUMgrid Managment network. 15 description: The interface connected to PLUMgrid Managment network.
16 os-data-network:
17 type: string
18 default:
19 description: |
20 The IP address and netmask of the OpenStack Data network (e.g.,
21 192.168.0.0/24)
22 .
23 This network will be used for tenant network traffic in overlay
24 networks.
25 fabric-interfaces: 16 fabric-interfaces:
26 default: 'MANAGEMENT' 17 default: 'MANAGEMENT'
27 type: string 18 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():
268 else: 268 else:
269 raise ValueError('No fabric interface provided for node') 269 raise ValueError('No fabric interface provided for node')
270 if interface_exists(node_fabric_interface): 270 if interface_exists(node_fabric_interface):
271 if is_address_in_network(config('os-data-network'), 271 return node_fabric_interface
272 get_iface_addr(node_fabric_interface)[0]):
273 return node_fabric_interface
274 else:
275 raise ValueError('Fabric interface not in fabric network')
276 else: 272 else:
277 log('Provided fabric interface %s does not exist' 273 log('Provided fabric interface %s does not exist'
278 % node_fabric_interface) 274 % 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 @@
4{{ dev }} = access_phys 4{{ dev }} = access_phys
5{% endfor -%} 5{% endfor -%}
6{% endif -%} 6{% endif -%}
7