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>

1 files changed, 11 insertions, 1 deletions

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 {} "