Add gluon scenario config file

This patch adds first version of gluon scenario config file,
as well as introducing etcd service in puppet-fdio and T-H-T.

JIRA: APEX-379

opnfv-tht-pr: 96
opnfv-puppet-tripleo-pr: 9

Change-Id: Icef29520d093e005dba9cbc5cf0e3fd1ed893cf4
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 8ae2048..381456e 100644 (file)
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -103,6 +103,7 @@ parameter_defaults:
     - OS::TripleO::Services::SensuClient
     - OS::TripleO::Services::FluentdClient
     - OS::TripleO::Services::VipHosts
+    - OS::TripleO::Services::Etcd
   ComputeServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 077046f..de6c303 100644 (file)
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -50,6 +50,7 @@ install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-a
 install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
+install config/deploy/os-odl_l3-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-gluon-noha.yaml
 install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
 install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
 install config/deploy/os-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
@@ -124,6 +125,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_l3-gluon-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
@@ -139,6 +141,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Thu Feb 2 2017 Feng Pan <fpan@redhat.com> - 4.0-2
+- Add odl_l3-gluon-noha config file
 * Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
 - Version update for Danube
 * Fri Sep 16 2016 Dan Radez <dradez@redhat.com> - 3.0-13

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 4886ee8..285c9c9 100644 (file)
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -47,4 +47,5 @@
 88,Default tenant_nic to its physical name
 89,Add enic workaround for UCS with OVS DPDK
 90,removing /%(tenantid)s from tacker heat_uri
-94,Add defaults to vpp_main_core and vpp_corelist_workers
\ No newline at end of file
+94,Add defaults to vpp_main_core and vpp_corelist_workers
+96,Add etcd service

diff --git a/config/deploy/os-odl_l3-gluon-noha.yaml b/config/deploy/os-odl_l3-gluon-noha.yaml
new file mode 100644 (file)
index 0000000..7812d05
--- /dev/null
+++ b/config/deploy/os-odl_l3-gluon-noha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  sdn_l3: true
+  odl_version: boron
+  tacker: false
+  congress: true
+  sfc: false
+  vpn: true