diff options
author | Tim Rozet <trozet@redhat.com> | 2017-10-19 20:50:45 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-10-19 20:50:45 +0000 |
commit | 658392b4f6972711ff4ddff85a5c4f2107f05ab4 (patch) | |
tree | f9fcf8e3537feb4c5ed0c444de57f232e5951ff4 /apex/overcloud | |
parent | ebff3ecd633a5df4ab3c995dce8a939762a88904 (diff) | |
parent | 873d9d4fa3999eb36e6fba3b7d790545b5e03a51 (diff) |
Merge "Adapt zrpcd to work for Carbon/Nitrogen" into stable/euphrates
Diffstat (limited to 'apex/overcloud')
-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 ef916a43..c0e9968b 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': |