Browse Source

L3 fabric changes

tags/14.04-eol
Junaid Ali 3 years ago
parent
commit
6033de46ac
3 changed files with 2 additions and 19 deletions
  1. 1
    11
      config.yaml
  2. 1
    7
      hooks/pg_gw_utils.py
  3. 0
    1
      templates/kilo/ifcs.conf

+ 1
- 11
config.yaml View File

@@ -13,22 +13,12 @@ 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
28 19
     description: |
29 20
        Interfaces that will provide fabric connectivity on the gateway nodes.
30
-       Provided in form of json in a string. These interfaces have to be connected 
31
-       to the os-data-network specified in the config. Default value is MANAGEMENT which
21
+       Provided in form of json in a string. Default value is MANAGEMENT which
32 22
        will configure the management interface as the fabric interface on each
33 23
        director.
34 24
   network-device-mtu:

+ 1
- 7
hooks/pg_gw_utils.py View File

@@ -23,8 +23,6 @@ from charmhelpers.contrib.network.ip import (
23 23
     get_iface_from_addr,
24 24
     get_bridges,
25 25
     get_bridge_nics,
26
-    is_address_in_network,
27
-    get_iface_addr
28 26
 )
29 27
 from charmhelpers.core.host import (
30 28
     write_file,
@@ -268,11 +266,7 @@ def get_fabric_interface():
268 266
         else:
269 267
             raise ValueError('No fabric interface provided for node')
270 268
         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')
269
+            return node_fabric_interface
276 270
         else:
277 271
             log('Provided fabric interface %s does not exist'
278 272
                 % 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