diff options
| author |   Romanos Skiadas <rski@intracom-telecom.com> | 2017-01-20 16:49:26 -0500 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-02-17 20:41:45 -0500 |
| commit | a7155293dba7c21f060b671b15fc36a66b84de83 (patch) | |
| tree | 104967a3691d4e042f086d2a2dba57a6b93da9cf /lib | |
| parent | 5e4c2ffc86d0426113f60b8069e81482f82bbc8d (diff) | |
Adding Quagga to build
Builds 6Wind ZRPC, Quagga, and dependencies required for OpenDaylight
with BGPVPN scenario. Packages are built into RPMs, and left on the
overcloud disk in /root/quagga. They are then installed at deploy time
if VPN feature flag is enabled. Note, for proper upstream we should
create a zrpc OOO service, but that can be a follow up patch. For that
we would also need official packaging/build system upstream somewhere.
JIRA: APEX-357
Changes Include:
- Build thrift rpm
- Build c-capnproto rpm
- Build quagga rpm
- Build zrpcd rpm
- Configure bgpd
- Detect deploy with VPN and install pkgs
- Enable zrpcd with systemd
Change-Id: I9825694f46aaab48a3d1cd5fc4d9a24c7370e8fa
Signed-off-by: Tim Rozet <trozet@redhat.com>
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 9 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index f6522b8a..5a0334ae 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -69,6 +69,15 @@ function overcloud_deploy { ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "rm -f overcloud-full.qcow2" scp ${SSH_OPTIONS[@]} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 "stack@$UNDERCLOUD":overcloud-full.qcow2 + if [ "${deploy_options_array['vpn']}" == 'True' ]; then + echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}" + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y install /root/quagga/*.rpm" \ + --run-command "systemctl enable zrpcd" \ + -a overcloud-full.qcow2 +EOI + fi + # Install ovs-dpdk inside the overcloud image if it is enabled. if [[ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' || "${deploy_options_array['dataplane']}" == 'fdio' ]]; then # install dpdk packages before ovs diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index 5ca91897..b7235952 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -271,4 +271,9 @@ if [[ "$ha_enabled" == 'True' ]]; then # trozet disable congress in HA until congress bugs are fixed overcloud_connect "controller0" "sudo pcs resource ban openstack-congress overcloud-controller-1; sudo pcs resource ban openstack-congress overcloud-controller-2; sudo systemctl restart openstack-congress" fi + +if [ "${deploy_options_array['vpn']}" == 'True' ]; then + # Check zrpcd is started + overcloud_connect "controller0" "sudo systemctl status zrpcd > /dev/null || echo 'WARNING: zrpcd is not running on controller0'" +fi } |