Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Enables containerized overcloud deployments
[apex.git]
/
apex
/
settings
/
deploy_settings.py
diff --git
a/apex/settings/deploy_settings.py
b/apex/settings/deploy_settings.py
index
f2012b2
..
4f887ed
100644
(file)
--- a/
apex/settings/deploy_settings.py
+++ b/
apex/settings/deploy_settings.py
@@
-23,7
+23,10
@@
REQ_DEPLOY_SETTINGS = ['sdn_controller',
'ceph',
'gluon',
'rt_kvm',
'ceph',
'gluon',
'rt_kvm',
- 'os_version']
+ 'os_version',
+ 'l2gw',
+ 'sriov',
+ 'containers']
OPT_DEPLOY_SETTINGS = ['performance',
'vsperf',
OPT_DEPLOY_SETTINGS = ['performance',
'vsperf',
@@
-115,6
+118,11
@@
class DeploySettings(dict):
raise DeploySettingsException(
"Invalid ODL version: {}".format(self[deploy_options][
'odl_version']))
raise DeploySettingsException(
"Invalid ODL version: {}".format(self[deploy_options][
'odl_version']))
+ elif req_set == 'sriov':
+ if self['deploy_options'][req_set] is True:
+ raise DeploySettingsException(
+ "Invalid SRIOV interface name: {}".format(
+ self['deploy_options']['sriov']))
if self['deploy_options']['odl_version'] == 'oxygen':
self['deploy_options']['odl_version'] = 'master'
if self['deploy_options']['odl_version'] == 'oxygen':
self['deploy_options']['odl_version'] = 'master'