diff options
| author |   Georg Kunz <georg.kunz@ericsson.com> | 2017-02-03 11:05:37 +0100 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-02-10 17:14:54 -0500 |
| commit | 6a2aaff3dbf80e91b873d15601c326d7eb194809 (patch) | |
| tree | e8e197681f9a62dcf47b06598f03263c330178a4 /lib | |
| parent | c30626e49098fbb3b02fc98e59d52af4fcc1cab8 (diff) | |
Adding gluon to the Build and Deploysystem
In order to make gluon really deployable some more things
need to be done:
- Add pull request 103 which add yaml files which
point to gluon puppet
- Rename the scenario to odl-gluon similar to bgpvpn
scenario
- Add tht of gluon to overcloud-deploy-functions.sh
JIRA: APEX-379
opnfv-tht-pr: 103
opnfv-puppet-tripleo-pr: 13
Change-Id: I3ccfb5a279f1df21c4da79fc47039b3c0b6e5495
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 3 | ||||
| -rw-r--r-- | lib/python/apex/deploy_settings.py | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 347bd749..77778e78 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -19,6 +19,9 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" elif [ "${deploy_options_array['vpn']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-bgpvpn.yaml" + if [ "${deploy_options_array['gluon']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/services/gluon.yaml" + fi elif [ "${deploy_options_array['vpp']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml" else diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py index 24287b83..2a9d5a67 100644 --- a/lib/python/apex/deploy_settings.py +++ b/lib/python/apex/deploy_settings.py @@ -22,7 +22,8 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'sfc', 'vpn', 'vpp', - 'ceph'] + 'ceph', + 'gluon'] OPT_DEPLOY_SETTINGS = ['performance', 'vsperf', 'ceph_device', 'yardstick'] @@ -69,6 +70,15 @@ class DeploySettings(dict): if not isinstance(deploy_options, dict): raise DeploySettingsException("deploy_options should be a list") + if ('gluon' in self['deploy_options'] and + 'vpn' in self['deploy_options']): + if (self['deploy_options']['gluon'] is True and + self['deploy_options']['vpn'] is False): + raise DeploySettingsException( + "Invalid deployment configuration: " + "If gluon is enabled, " + "vpn also needs to be enabled") + for setting, value in deploy_options.items(): if setting not in REQ_DEPLOY_SETTINGS + OPT_DEPLOY_SETTINGS: raise DeploySettingsException("Invalid deploy_option {} " |