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:
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

+ 1
- 5
hooks/pg_gw_utils.py View File

@@ -268,11 +268,7 @@ def get_fabric_interface():
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)

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

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


Loading…
Cancel
Save