summaryrefslogtreecommitdiffstats
path: root/build/overcloud-full.sh
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-09-26 14:39:23 -0400
committerTim Rozet <trozet@redhat.com>2016-10-05 16:21:17 -0400
commit136bfee6d8a4dddd18d621047086031a1bb584d2 (patch)
tree05453b75d24ef75686d77137928daa26bfd9a61f /build/overcloud-full.sh
parent9b06e3cbd8d24ec9cf9cb0cbbf16b6b98b8e4b67 (diff)
VPP version update
- Update VPP version to latest on 16.09 branch - Change networking-vpp repo to point to openstack. - Update VPP python API rpm location - Configure etcd for networking-vpp ML2 plugin opnfv-tht-pr: 85 JIRA: APEX-283 Change-Id: I4e69de3c51b1f4221995cc8568cdfa18aacbc55c Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build/overcloud-full.sh')
-rwxr-xr-xbuild/overcloud-full.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 88f96851..7af3f831 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -118,6 +118,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "pip install distro flask_restful" \
--run-command "yum install -y etcd" \
--run-command "pip install python-etcd" \
+ --run-command "puppet module install cristifalcas/etcd" \
--install "centos-release-qemu-ev" \
--run-command "yum update -y" \
--run-command "yum remove -y qemu-system-x86" \
@@ -132,7 +133,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
--run-command "yum install -y /root/fdio/*.rpm" \
--run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
- --run-command "tar zxvf /root/fdio/vpp_papi*.tar.gz -C /" \
--install unzip \
--upload puppet-fdio.tar.gz:/etc/puppet/modules \
--run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
@@ -144,7 +144,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
--upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
- --run-command "yum install -y https://dl.dropboxusercontent.com/u/7079970/rabbitmq-server-3.6.3-5.el7ost.noarch.rpm" \
--run-command "pip install python-senlinclient" \
--upload ../neutron/agent/interface/interface.py:/usr/lib/python2.7/site-packages/neutron/agent/linux/ \
--run-command "mkdir /root/fdio_neutron_l3" \
@@ -152,6 +151,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload ../neutron/agent/l3/router_info.py:/root/fdio_neutron_l3/ \
--upload ../puppet-neutron/manifests/agents/ml2/networking-vpp.pp:/etc/puppet/modules/neutron/manifests/agents/ml2/ \
--upload ../puppet-neutron/manifests/plugins/ml2/networking-vpp.pp:/etc/puppet/modules/neutron/manifests/plugins/ml2/ \
+ --upload ../puppet-neutron/lib/puppet/type/neutron_agent_vpp.rb:/etc/puppet/modules/neutron/lib/puppet/type/ \
+ --mkdir /etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp \
+ --upload ../puppet-neutron/lib/puppet/provider/neutron_agent_vpp/ini_setting.rb:/etc/puppet/modules/neutron/lib/puppet/provider/neutron_agent_vpp/ \
-a overcloud-full_build.qcow2
rm -rf ovs_nsh_patches