diff options
author | Tim Rozet <trozet@redhat.com> | 2017-09-29 23:17:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 23:17:53 +0000 |
commit | c104a284855069882e2625c57b5c2c78b0c6ba4d (patch) | |
tree | a11156ea94ff9dfddcc278c973771d66c452c332 /apex/settings/deploy_settings.py | |
parent | 5729ad141664925d922ea6cbea7cdcde09d9b18c (diff) | |
parent | b6896a9bbfd7d4825f6b68b594441a3e0be7b85f (diff) |
Merge "re-enable support for fdio dvr scenario" into stable/euphrates
Diffstat (limited to 'apex/settings/deploy_settings.py')
-rw-r--r-- | apex/settings/deploy_settings.py | 6 |
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" |