summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-26 12:29:57 -0400
committerTim Rozet <trozet@redhat.com>2016-08-26 18:46:43 +0000
commit47830fb8a82e96deb3f2b6d521ee11a44db734c9 (patch)
tree7d0d00ce7659a48260e13fb9b7b71941a89de769 /build
parent0650ee4206e1802240d2d4bef887bb13c3a1a98b (diff)
Freezes FDIO/Honeycomb artifacts
JIRA: APEX-243 Change-Id: I1ed843c316b840aa9c0f85ef250fcecc59197188 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
-rw-r--r--build/Makefile2
-rwxr-xr-xbuild/overcloud-full.sh14
-rwxr-xr-xbuild/overcloud-opendaylight.sh6
-rw-r--r--build/variables.sh10
4 files changed, 25 insertions, 7 deletions
diff --git a/build/Makefile b/build/Makefile
index 2b92359..3a430b2 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -241,7 +241,7 @@ overcloud-full-clean:
.PHONY: overcloud-full
overcloud-full: images/overcloud-full.qcow2
-images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm vpp-build
+images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm
@echo "Building the Apex Base Overcloud Image"
@./overcloud-full.sh
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index bce9943..12984b2 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -50,6 +50,12 @@ for package in ${dpdk_rpms[@]}; do
dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
done
+fdio_pkg_str=''
+for package in ${fdio_pkgs[@]}; do
+ wget "$fdio_uri_base/$package"
+ fdio_pkg_str+=" --upload $package:/root/fdio"
+done
+
# tar up the congress puppet module
rm -rf puppet-congress
git clone -b stable/mitaka https://github.com/radez/puppet-congress
@@ -105,7 +111,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /etc/puppet/modules && rm -rf tripleo && tar xzf opnfv-puppet-tripleo.tar.gz" \
--run-command "echo 'nf_conntrack_proto_sctp' > /etc/modules-load.d/nf_conntrack_proto_sctp.conf" \
--run-command "mkdir /root/dpdk_rpms" \
+ --run-command "mkdir /root/fdio" \
$dpdk_pkg_str \
+ $fdio_pkg_str \
--install "centos-release-qemu-ev" \
--run-command "yum update -y" \
--run-command "yum remove -y qemu-system-x86" \
@@ -118,10 +126,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
--run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
--run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
- --upload ../vpp-bin.tar.gz:/root \
- --run-command "cd /root && tar zxvf vpp-bin.tar.gz" \
- --run-command "yum install -y /root/vpp-bin/*.rpm" \
- --run-command "tar zxvf /root/vpp-bin/vpp_papi*.tar.gz -C /" \
+ --run-command "yum install -y /root/fdio/*.rpm" \
+ --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" \
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 65f9c06..af65910 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -46,6 +46,8 @@ EOF
# SDNVPN - Copy tunnel setup script
wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py
+# Honeycomb RPM
+wget $fdio_uri_base/$honeycomb_pkg
# install ODL packages
# install Jolokia for ODL HA
@@ -60,8 +62,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \
--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" \
- --upload ../honeycomb-1.0.0-99.noarch.rpm:/root/ \
- --run-command "yum -y install /root/honeycomb-1.0.0-99.noarch.rpm" \
+ --upload $honeycomb_pkg:/root/ \
+ --run-command "yum -y install /root/$honeycomb_pkg" \
--upload ./setup_TEPs.py:/tmp \
-a overcloud-full-opendaylight_build.qcow2
diff --git a/build/variables.sh b/build/variables.sh
index 8778fe3..6435eeb 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -25,5 +25,15 @@ dpdk_rpms=(
'ovs4opnfv-55ef39e7-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
)
+fdio_uri_base=http://artifacts.opnfv.org/apex/colorado
+fdio_pkgs=(
+'vpp-16.09-rc1~7_gea60221~b1030.x86_64.rpm'
+'vpp-devel-16.09-rc1~7_gea60221~b1030.x86_64.rpm'
+'vpp-lib-16.09-rc1~7_gea60221~b1030.x86_64.rpm'
+'vpp_papi-1.0.linux-x86_64.tar.gz'
+)
+honeycomb_pkg='honeycomb-1.0.0-1066.noarch.rpm'
+
+
ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm
ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm