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)

diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index 2772ced..dec80fa 100755 (executable)
--- 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 (executable)
--- 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