Fix using ODL versions other than oxygen

[apex.git] / apex / settings / deploy_settings.py

diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 29fe64f..9f8a6f1 100644 (file)
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -27,7 +27,8 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
                        'l2gw',
                        'sriov',
                        'containers',
-                       'ceph_device']
+                       'ceph_device',
+                       'vim']
 
 OPT_DEPLOY_SETTINGS = ['performance',
                        'vsperf',
@@ -113,6 +114,8 @@ class DeploySettings(dict):
                 elif req_set == 'os_version':
                     self['deploy_options'][req_set] = \
                         constants.DEFAULT_OS_VERSION
+                elif req_set == 'vim':
+                    self['deploy_options'][req_set] = 'openstack'
                 else:
                     self['deploy_options'][req_set] = False
             elif req_set == 'odl_version' and self['deploy_options'][
@@ -126,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"