summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-04-28 10:39:59 -0400
committerTim Rozet <trozet@redhat.com>2017-04-28 19:58:13 +0000
commitc6b4b82f7f9d13721ae141b570221a20b53117ce (patch)
tree567ef411c73e8e94055e523bc52128df0f686fa6
parent6557a832f652ac8a57ef9ad4c7b5cded3f9a7db2 (diff)
Migrates quagga install to build time
It is OK to have quagga installed at build time, we just want to avoid enabling it unless quagga is deployed. Change-Id: I41899d697a24976c3b169b3b8f5eef5c0df6bed4 Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit f50f469ff5db3fd54c49cc932ff7791c406891cf)
-rwxr-xr-xbuild/overcloud-opendaylight.sh2
-rwxr-xr-xlib/overcloud-deploy-functions.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 2772ced..dec80fa 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -110,6 +110,8 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--run-command "yum downgrade -y python-zmq-14.3.1" \
--install zeromq-4.1.4 \
--install capnproto-libs,capnproto \
+ --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
+ --run-command "sudo usermod -a -G quaggavt quagga" \
--upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \
--upload ${BUILD_ROOT}/patches/disable_odl_clustering.patch:/etc/puppet/modules/tripleo/ \
--upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 6fadf0b..ba62ada 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -123,8 +123,6 @@ EOI
echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}"
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
LIBGUESTFS_BACKEND=direct virt-customize \
- --run-command "cd /root/quagga; packages=\\\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \\\$packages" \
- --run-command "sudo usermod -a -G quaggavt quagga" \
--run-command "systemctl enable zrpcd" \
-a overcloud-full.qcow2
EOI