summaryrefslogtreecommitdiffstats
path: root/apex/settings/deploy_settings.py
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-09-11 15:58:49 -0400
committerFeng Pan <fpan@redhat.com>2017-09-28 19:56:09 -0400
commita3c2c8c746470c993d70d92d13415e2b4263cc25 (patch)
tree503f3a4deed376768693bac148a36a145c55cbfe /apex/settings/deploy_settings.py
parent7af8cf039ef21da528a8cb53e0eb78c1b6878714 (diff)
re-enable support for fdio dvr scenario
- Update FDIO scenarios to use master branch images - Update VPP/HC version to master for all fdio scenarios apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33 apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607 apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'apex/settings/deploy_settings.py')
-rw-r--r--apex/settings/deploy_settings.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 793e43ac..164997ec 100644
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -31,13 +31,14 @@ OPT_DEPLOY_SETTINGS = ['performance',
'yardstick',
'dovetail',
'odl_vpp_routing_node',
+ 'dvr',
'odl_vpp_netvirt',
'barometer']
VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs']
VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio']
-VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'master']
+VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
class DeploySettings(dict):
@@ -110,6 +111,9 @@ class DeploySettings(dict):
"Invalid ODL version: {}".format(self[deploy_options][
'odl_version']))
+ if self['deploy_options']['odl_version'] == 'oxygen':
+ self['deploy_options']['odl_version'] = 'master'
+
if 'performance' in deploy_options:
if not isinstance(deploy_options['performance'], dict):
raise DeploySettingsException("Performance deploy_option"