Merge "Adding yardstick installation using docker container"

diff --git a/build/Makefile b/build/Makefile
index af84ea8..7b392d2 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -8,7 +8,7 @@
 ##############################################################################
 
 export USE_MASTER = ""
-export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.2.1511/isos/x86_64/CentOS-7-x86_64-DVD-1511.iso
+export CENTDNLD = http://mirrors.cat.pdx.edu/centos/7.3.1611/isos/x86_64/CentOS-7-x86_64-DVD-1611.iso
 export RELEASE = "0"
 
 export RPM_DIST = $(shell rpm -E %dist)

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/overcloud-full.sh b/build/overcloud-full.sh
index 1264430..59f67fe 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -32,7 +32,7 @@ popd > /dev/null
 
 # download customized os-net-config
 rm -fr os-net-config
-git clone https://github.com/trozet/os-net-config.git -b stable/colorado
+git clone https://github.com/trozet/os-net-config.git -b stable/danube
 pushd os-net-config/os_net_config > /dev/null
 git archive --format=tar.gz --prefix=os_net_config/ HEAD > ${BUILD_DIR}/os-net-config.tar.gz
 popd > /dev/null

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 0b00211..0931968 100755 (executable)
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -52,17 +52,6 @@ enabled=1
 gpgcheck=0
 EOF
 
-#BGPVPN Repo
-cat > ${BUILD_DIR}/bgpvpn.repo << EOF
-[bgpvpn]
-name=bgpvpn
-baseurl=https://trunk.rdoproject.org/centos7/consistent/
-includepkgs=python2-networking-bgpvpn
-enabled=1
-gpgcheck=0
-priority=1
-EOF
-
 # OpenDaylight Puppet Module
 rm -rf puppet-opendaylight
 git clone -b master https://github.com/dfarrell07/puppet-opendaylight
@@ -70,6 +59,18 @@ pushd puppet-opendaylight > /dev/null
 git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight.tar.gz
 popd > /dev/null
 
+# networking-BGPVPN
+rm -rf networking-bgpvpn
+mkdir networking-bgpvpn
+pushd networking-bgpvpn > /dev/null
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python2-networking-bgpvpn-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-heat-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-dashboard-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-doc-5.0.1-dev6.noarch.rpm
+wget https://github.com/oglok/networking-bgpvpn-rpm/raw/stable/newton/python-networking-bgpvpn-tests-5.0.1-dev6.noarch.rpm
+popd > /dev/null
+tar czf networking-bgpvpn.tar.gz networking-bgpvpn/
+
 # install ODL packages
 # install Jolokia for ODL HA
 # Patch in OPNFV custom puppet-tripleO
@@ -82,13 +83,13 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \
     --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
     --install opendaylight,python-networking-odl \
-    --upload ${BUILD_DIR}/bgpvpn.repo:/etc/yum.repos.d/bgpvpn.repo \
-    --install python-networking-bgpvpn \
     --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \
     --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \
     --install honeycomb \
     --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
+    --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \
+    --run-command "cd /root/ && tar xzf networking-bgpvpn.tar.gz && cd networking-bgpvpn/ && yum localinstall python2-networking-bgpvpn && rm -rf /root/networking-bgpvpn*" \
     -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 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

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 980478c..7c83cc6 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -18,11 +18,9 @@ function overcloud_deploy {
     if [ "${deploy_options_array['sfc']}" == 'True' ]; then
       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/opendaylight_sdnvpn.yaml"
+      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-bgpvpn.yaml"
     elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml"
-    elif [ "${deploy_options_array['vpn']}" == 'true' ]; then
-      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
     else
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml"
     fi