From: tomsou <soth@intracom-telecom.com>
Date: Fri, 20 Oct 2017 14:44:41 +0000 (+0300)
Subject: Fix zrpcd start in the controller node
X-Git-Tag: opnfv-6.0.0~60
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=commitdiff_plain;h=577ccdd1e7ce654ebc7479d8bd1e232abb922571

Fix zrpcd start in the controller node

Add sudo into zrpcd process start command
Add starting script into /etc/rc.d/rc.local too

Change-Id: I3c724ff60d4c3feb7379b1a8bbeca8a928cfe81b
Signed-off-by: tomsou <soth@intracom-telecom.com>
---

diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index bf209285..495743bd 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -177,7 +177,7 @@ def prep_image(ds, img, tmp_dir, root_pw=None):
         virt_cmds.append({con.VIRT_RUN_CMD: "chmod +x /etc/rc.d/rc.local"})
         virt_cmds.append({
             con.VIRT_RUN_CMD:
-                "echo '/opt/quagga/etc/init.d/zrpcd start' > "
+                "echo 'sudo /opt/quagga/etc/init.d/zrpcd start' > "
                 "/opt/quagga/etc/init.d/zrpcd_start.sh"})
         virt_cmds.append({
             con.VIRT_RUN_CMD: "chmod +x /opt/quagga/etc/init.d/"
@@ -185,6 +185,9 @@ def prep_image(ds, img, tmp_dir, root_pw=None):
         virt_cmds.append({
             con.VIRT_RUN_CMD: "sed -i '$a /opt/quagga/etc/"
                               "init.d/zrpcd_start.sh' /etc/rc.local "})
+        virt_cmds.append({
+            con.VIRT_RUN_CMD: "sed -i '$a /opt/quagga/etc/"
+                              "init.d/zrpcd_start.sh' /etc/rc.d/rc.local"})
         logging.info("ZRPCD process started")
 
     dataplane = ds_opts['dataplane']