summaryrefslogtreecommitdiffstats
path: root/lib/python
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/apex/deploy_env.py2
-rw-r--r--lib/python/apex/network_environment.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py
index 1fe137e4..816dc114 100644
--- a/lib/python/apex/deploy_env.py
+++ b/lib/python/apex/deploy_env.py
@@ -21,7 +21,7 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
'vpn',
'vpp']
-OPT_DEPLOY_SETTINGS = ['performance']
+OPT_DEPLOY_SETTINGS = ['performance', 'vsperf']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova']
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index bf4bdc79..981c8f1c 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -84,6 +84,7 @@ class NetworkEnvironment:
public_cidr = net_settings[PUBLIC_NETWORK]['cidr']
self.netenv_obj[param_def]['ExternalNetCidr'] = str(public_cidr)
if net_settings[PUBLIC_NETWORK]['vlan'] != 'native':
+ self.netenv_obj[param_def]['NeutronExternalNetworkBridge'] = '""'
self.netenv_obj[param_def]['ExternalNetworkVlanID'] = \
net_settings[PUBLIC_NETWORK]['vlan']
public_range = \