diff options
author | Tim Rozet <trozet@redhat.com> | 2017-10-19 13:28:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-19 13:28:16 +0000 |
commit | 6f0190c0ce9b58ce8cb41084661891cb35864dfe (patch) | |
tree | c1c18c3dd2cfb5fdafc2141225ecff5ed55b2234 /apex/overcloud/deploy.py | |
parent | 5a9a6460ab27d758ac72321998a5ffda3e98e931 (diff) | |
parent | 663db511c540fe94b4396146f76bbc40bd3fd852 (diff) |
Merge "Adapt zrpcd to work for Carbon/Nitrogen"
Diffstat (limited to 'apex/overcloud/deploy.py')
-rw-r--r-- | apex/overcloud/deploy.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py index 8016e1fd..bf209285 100644 --- a/apex/overcloud/deploy.py +++ b/apex/overcloud/deploy.py @@ -11,7 +11,6 @@ import base64 import fileinput import logging import os -import re import shutil import uuid import struct @@ -175,8 +174,18 @@ def prep_image(ds, img, tmp_dir, root_pw=None): }]) if ds_opts['vpn']: - virt_cmds.append({con.VIRT_RUN_CMD: "systemctl enable zrpcd"}) - logging.info("ZRPC and Quagga enabled") + 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' > " + "/opt/quagga/etc/init.d/zrpcd_start.sh"}) + virt_cmds.append({ + con.VIRT_RUN_CMD: "chmod +x /opt/quagga/etc/init.d/" + "zrpcd_start.sh"}) + virt_cmds.append({ + con.VIRT_RUN_CMD: "sed -i '$a /opt/quagga/etc/" + "init.d/zrpcd_start.sh' /etc/rc.local "}) + logging.info("ZRPCD process started") dataplane = ds_opts['dataplane'] if dataplane == 'ovs_dpdk' or dataplane == 'fdio': |