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 | |
| parent | 5a9a6460ab27d758ac72321998a5ffda3e98e931 (diff) | |
| parent | 663db511c540fe94b4396146f76bbc40bd3fd852 (diff) | |
Merge "Adapt zrpcd to work for Carbon/Nitrogen"
| -rw-r--r-- | apex/overcloud/deploy.py | 15 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 7 | ||||
| -rw-r--r-- | lib/ansible/playbooks/post_deploy_overcloud.yml | 12 |
3 files changed, 21 insertions, 13 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': diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index ed3f539e..024c6a5d 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -99,14 +99,13 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ if [ "$(uname -i)" == 'x86_64' ]; then # Download quagga/zrpc rpms -populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz +populate_cache http://artifacts.opnfv.org/apex/euphrates/quagga/quagga-4.tar.gz LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --install zeromq-4.1.4 \ - --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \ - --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \ + --upload ${CACHE_DIR}/quagga-4.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf quagga-4.tar.gz" \ --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \ - --run-command "sudo usermod -a -G quaggavt quagga" \ -a overcloud-full-opendaylight_build.qcow2 fi diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml index 5640e906..af1c648a 100644 --- a/lib/ansible/playbooks/post_deploy_overcloud.yml +++ b/lib/ansible/playbooks/post_deploy_overcloud.yml @@ -22,12 +22,12 @@ when: - sfc - "'controller' in ansible_hostname" - - name: Ensure ZRPCD is up - systemd: - name: zrpcd - state: started - enabled: yes - become: yes + - name: Ensure ZRPCD is running + shell: ps aux | grep zrpcd | grep -v grep + ignore_errors: yes + changed_when: false + register: zrpcd_status + failed_when: zrpcd_status.rc == 0 when: - vpn - "'controller-0' in ansible_hostname" |