summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apex/deploy.py1
-rw-r--r--apex/overcloud/deploy.py1
-rw-r--r--apex/settings/deploy_settings.py3
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec2
-rw-r--r--config/deploy/os-odl-l2gw-ha.yaml12
-rw-r--r--config/deploy/os-odl-l2gw-noha.yaml12
-rw-r--r--docs/release/installation/architecture.rst4
7 files changed, 34 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',
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index dde13a78..342f4427 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -92,6 +92,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-l2gw-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-l2gw-noha.yaml
%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml
%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml
%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml
diff --git a/config/deploy/os-odl-l2gw-ha.yaml b/config/deploy/os-odl-l2gw-ha.yaml
new file mode 100644
index 00000000..a22da3bb
--- /dev/null
+++ b/config/deploy/os-odl-l2gw-ha.yaml
@@ -0,0 +1,12 @@
+---
+global_params:
+ ha_enabled: true
+
+deploy_options:
+ sdn_controller: opendaylight
+ odl_version: nitrogen
+ tacker: false
+ congress: true
+ sfc: false
+ vpn: false
+ l2gw: true
diff --git a/config/deploy/os-odl-l2gw-noha.yaml b/config/deploy/os-odl-l2gw-noha.yaml
new file mode 100644
index 00000000..ae5218aa
--- /dev/null
+++ b/config/deploy/os-odl-l2gw-noha.yaml
@@ -0,0 +1,12 @@
+---
+global_params:
+ ha_enabled: false
+
+deploy_options:
+ sdn_controller: opendaylight
+ odl_version: nitrogen
+ tacker: false
+ congress: true
+ sfc: false
+ vpn: false
+ l2gw: true
diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index 079c26d5..b8db7c86 100644
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -159,7 +159,11 @@ issues per scenario. The following scenarios correspond to a supported
| os-odl-bgpvpn-ha | SDNVPN | Yes |
+-------------------------+-------------+---------------+
| os-odl-bgpvpn-noha | SDNVPN | Yes |
+++-------------------------+-------------+---------------+
+| os-odl-l2gw-ha | Apex | No |
+-------------------------+-------------+---------------+
+| os-odl-l2gw-noha | Apex | No |
+-------------------------+-------------+---------------+
| os-odl-sfc-ha | SFC | No |
+-------------------------+-------------+---------------+
| os-odl-sfc-noha | SFC | Yes |