From 46bf00b967844dc712dfe409e55fc5fe18fa119f Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 7 Dec 2018 09:49:21 -0500 Subject: Fix using ODL versions other than oxygen Fixes a bug where oxygen was always being used even if a different ODL version was specified in the deploy settings. Also updates the valid ODL versions with fluorine and neon. JIRA: APEX-648 Change-Id: Ie49c28d1757cd7e57802d67e48904ce04864feaf Signed-off-by: Tim Rozet --- apex/settings/deploy_settings.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'apex/settings/deploy_settings.py') 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" -- cgit 1.2.3-korg