summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomsou <soth@intracom-telecom.com>2017-10-09 16:53:39 +0300
committerTim Rozet <trozet@redhat.com>2017-10-19 13:31:15 +0000
commit873d9d4fa3999eb36e6fba3b7d790545b5e03a51 (patch)
tree20fd0bf50a69c3f4fafdfa0c171f965ceda86fe3
parente675928d02d66928f291b83ef805b56a5fc41010 (diff)
Adapt zrpcd to work for Carbon/Nitrogen
It updates the quagga tar.gz file which is used to install zrpcd/quagga. The new rpms are compiled with thrift-version 4 Zrpcd is installed as a process. Additional changes takwqe place adopting the installation and checking of zrpcd process Note that an extra patch is needed to update or remove the building procedure, which is present within the project but not used actually. JIRA: APEX-508 Change-Id: If6da075d2aafdb8c2ecfc599f595a7201490aa23 Signed-off-by: tomsou <soth@intracom-telecom.com> (cherry picked from commit 663db511c540fe94b4396146f76bbc40bd3fd852)
-rw-r--r--apex/overcloud/deploy.py15
-rwxr-xr-xbuild/overcloud-opendaylight.sh7
-rw-r--r--lib/ansible/playbooks/post_deploy_overcloud.yml12
3 files changed, 21 insertions, 13 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index ef916a4..c0e9968 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 ed3f539..024c6a5 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 5640e90..af1c648 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"