summaryrefslogtreecommitdiffstats
path: root/apex
diff options
context:
space:
mode:
authorRicardo Noriega <rnoriega@redhat.com>2018-01-18 18:25:27 +0100
committerTim Rozet <trozet@redhat.com>2018-02-07 19:11:29 +0000
commit804160f8ec597ee23a5b5ac18ec6d672586b37b4 (patch)
tree7326601544f53b07cfb8c5e04c5be3fcf64a2a65 /apex
parent50f1d92e0aa0e5720adc44f23ed59a4cfc1c4b58 (diff)
Adding L2GW Scenario
This scenario allows you to install L2GW Neutron driver and point to OpenDaylight as service provider. apex-tripleo-heat-templates: I37039207bc7cf9965d26e6dfa034e84bf9b7224d Change-Id: I0dfd37bcc5060f0ad8caa95e1f87a7411bd6e723 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
Diffstat (limited to 'apex')
-rw-r--r--apex/deploy.py1
-rw-r--r--apex/overcloud/deploy.py1
-rw-r--r--apex/settings/deploy_settings.py3
3 files changed, 4 insertions, 1 deletions
diff --git a/apex/deploy.py b/apex/deploy.py
index d2f1c936..3aed9778 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -518,6 +518,7 @@ def main():
# TODO(trozet): just parse all ds_opts as deploy vars one time
deploy_vars['sfc'] = ds_opts['sfc']
deploy_vars['vpn'] = ds_opts['vpn']
+ deploy_vars['l2gw'] = ds_opts.get('l2gw')
# TODO(trozet): pull all logs and store in tmp dir in overcloud
# playbook
post_overcloud = os.path.join(args.lib_dir, ANSIBLE_PATH,
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index f988cf3d..19d46e15 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -38,6 +38,7 @@ SDN_FILE_MAP = {
'dvr': 'neutron-opendaylight-fdio-dvr.yaml',
'default': 'neutron-opendaylight-honeycomb.yaml'
},
+ 'l2gw': 'neutron-l2gw-opendaylight.yaml',
'default': 'neutron-opendaylight.yaml',
},
'onos': {
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index f2012b24..eec98225 100644
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -23,7 +23,8 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller',
'ceph',
'gluon',
'rt_kvm',
- 'os_version']
+ 'os_version',
+ 'l2gw']
OPT_DEPLOY_SETTINGS = ['performance',
'vsperf',