summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/opnfv-environment.yaml1
-rwxr-xr-xbuild/overcloud-opendaylight.sh12
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec6
-rw-r--r--config/deploy/os-odl-gluon-noha.yaml (renamed from config/deploy/os-odl_l3-gluon-noha.yaml)1
-rwxr-xr-xlib/overcloud-deploy-functions.sh3
-rw-r--r--lib/python/apex/deploy_settings.py12
6 files changed, 32 insertions, 3 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 381456e9..ea14ef55 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -104,6 +104,7 @@ parameter_defaults:
- OS::TripleO::Services::FluentdClient
- OS::TripleO::Services::VipHosts
- OS::TripleO::Services::Etcd
+ - OS::TripleO::Services::Gluon
ComputeServices:
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephClient
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index f64e514c..def2bc4c 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -64,6 +64,13 @@ wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-net
popd > /dev/null
tar czf networking-bgpvpn.tar.gz networking-bgpvpn/
+#Gluon puppet module
+rm -rf netready
+git clone -b master https://gerrit.opnfv.org/gerrit/netready
+pushd netready/ > /dev/null
+git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz
+popd > /dev/null
+
# install ODL packages
# install Jolokia for ODL HA
# Patch in OPNFV custom puppet-tripleO
@@ -84,6 +91,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall -y *.rpm && rm -rf /root/networking-bgpvpn*" \
--run-command "rm -f /etc/neutron/networking_bgpvpn.conf" \
--run-command "touch /etc/neutron/networking_bgpvpn.conf" \
+ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \
+ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \
+ --install epel-release \
+ --install python-click \
+ --install http://artifacts.opnfv.org/netready/gluon-0.0.1-1_20170127.noarch.rpm \
-a overcloud-full-opendaylight_build.qcow2
mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index de6c3034..db271848 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -50,7 +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-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-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
@@ -125,7 +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-odl-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
@@ -141,6 +141,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Fri Feb 3 2017 Nikolas Hermanns <nikolas.hermanns@ericsson.com> - 4.0-3
+- change odl_l3-gluon-noha to odl-gluon-noha
* 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
diff --git a/config/deploy/os-odl_l3-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml
index 7812d054..cdeb90c5 100644
--- a/config/deploy/os-odl_l3-gluon-noha.yaml
+++ b/config/deploy/os-odl-gluon-noha.yaml
@@ -9,3 +9,4 @@ deploy_options:
congress: true
sfc: false
vpn: true
+ gluon: true \ No newline at end of file
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 {} "