Browse Source

L3 fabric changes

tags/14.04-eol
Junaid Ali 3 years ago
parent
commit
a3da099ebe
3 changed files with 1 additions and 15 deletions
  1. 0
    9
      config.yaml
  2. 1
    5
      hooks/pg_gw_utils.py
  3. 0
    1
      templates/kilo/ifcs.conf

+ 0
- 9
config.yaml View File

@@ -13,15 +13,6 @@ options:
13 13
     type: string
14 14
     default: 'juju-br0'
15 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 16
   fabric-interfaces:
26 17
     default: 'MANAGEMENT'
27 18
     type: string

+ 1
- 5
hooks/pg_gw_utils.py View File

@@ -268,11 +268,7 @@ def get_fabric_interface():
268 268
         else:
269 269
             raise ValueError('No fabric interface provided for node')
270 270
         if interface_exists(node_fabric_interface):
271
-            if is_address_in_network(config('os-data-network'),
272
-                                     get_iface_addr(node_fabric_interface)[0]):
273
-                return node_fabric_interface
274
-            else:
275
-                raise ValueError('Fabric interface not in fabric network')
271
+            return node_fabric_interface
276 272
         else:
277 273
             log('Provided fabric interface %s does not exist'
278 274
                 % node_fabric_interface)

+ 0
- 1
templates/kilo/ifcs.conf View File

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

Loading…
Cancel
Save