From 168e9e92a39d03b5455938dfa7269017602e99e8 Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Fri, 7 Apr 2017 06:41:40 -0400
Subject: Fixing zrpcd is not starting

JIRA: APEX-437
JIRA: APEX-448

Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Change-Id: I91c1b3bef83c808166072e00c751d8fac3565b5f
(cherry picked from commit d81cd2087be5edf5d2c0d98ad71a63360ae8511f)
---
 lib/overcloud-deploy-functions.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'lib/overcloud-deploy-functions.sh')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 271b4b84..2899c0e3 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -122,12 +122,11 @@ EOI
   if [ "${deploy_options_array['vpn']}" == 'True' ]; then
       echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}"
       ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-      LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y install /root/quagga/*.rpm" \
-                                               --run-command "sudo usermod -a -G quaggavt quagga" \
-                                               --run-command "sudo mkdir -p /var/run/quagga/" \
-                                               --run-command "sudo chown quagga:quagga -R /var/run/quagga/" \
-                                               --run-command "systemctl enable zrpcd" \
-                                               -a overcloud-full.qcow2
+      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
   fi
 
-- 
cgit 1.2.3-korg