summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-04-28 19:54:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-28 19:54:33 +0000
commit4c3ab00cb5d3fa5ea43dc0370ac7c20fa20441c1 (patch)
tree3ff5c99c0c80c155f7870090e2f64630a63a8597
parent0801e5d51eb49576dea4db6d421782476a045217 (diff)
parentf50f469ff5db3fd54c49cc932ff7791c406891cf (diff)
Merge "Migrates quagga install to build time"
-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 ca5ee068..4a6738b3 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 efacaf83..542e9cfc 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