diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-12-08 18:35:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-12-08 18:35:19 +0000 |
| commit | 387dab2bf2eb60ec6861ea398b5c8bfb4dad52d7 (patch) | |
| tree | 1ef49a49f422356ac9985b383c2289d0cab1e086 /apex/settings/deploy_settings.py | |
| parent | 8154d4c215974c9c51b901cc655faace6eca2f98 (diff) | |
| parent | c4ac31069c875b7f0922963194954aff4a5bb644 (diff) | |
Merge "Fix using ODL versions other than oxygen" into stable/gambia
Diffstat (limited to 'apex/settings/deploy_settings.py')
| -rw-r--r-- | apex/settings/deploy_settings.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py index 00e6d6c0..9f8a6f18 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -129,9 +129,6 @@ class DeploySettings(dict): "Invalid SRIOV interface name: {}".format( self['deploy_options']['sriov'])) - 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" |