diff options
Diffstat (limited to 'apex/settings/deploy_settings.py')
| -rw-r--r-- | apex/settings/deploy_settings.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py index f2012b24..9f8a6f18 100644 --- a/apex/settings/deploy_settings.py +++ b/apex/settings/deploy_settings.py @@ -23,11 +23,15 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'ceph', 'gluon', 'rt_kvm', - 'os_version'] + 'os_version', + 'l2gw', + 'sriov', + 'containers', + 'ceph_device', + 'vim'] OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', - 'ceph_device', 'yardstick', 'dovetail', 'odl_vpp_routing_node', @@ -102,12 +106,16 @@ class DeploySettings(dict): self['deploy_options'][req_set] = 'ovs' elif req_set == 'ceph': self['deploy_options'][req_set] = True + elif req_set == 'ceph_device': + self['deploy_options'][req_set] = '/dev/loop3' elif req_set == 'odl_version': self['deploy_options'][req_set] = \ constants.DEFAULT_ODL_VERSION 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'][ @@ -115,9 +123,11 @@ class DeploySettings(dict): raise DeploySettingsException( "Invalid ODL version: {}".format(self[deploy_options][ 'odl_version'])) - - if self['deploy_options']['odl_version'] == 'oxygen': - self['deploy_options']['odl_version'] = 'master' + elif req_set == 'sriov': + if self['deploy_options'][req_set] is True: + raise DeploySettingsException( + "Invalid SRIOV interface name: {}".format( + self['deploy_options']['sriov'])) if 'performance' in deploy_options: if not isinstance(deploy_options['performance'], dict): |