From a7155293dba7c21f060b671b15fc36a66b84de83 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Fri, 20 Jan 2017 16:49:26 -0500 Subject: 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 Signed-off-by: Nikolas Hermanns Signed-off-by: Romanos Skiadas --- build/Makefile | 60 ++- build/build_quagga.sh | 250 ++++++++++ build/overcloud-opendaylight.sh | 10 + build/patches/fix_quagga_make_dist.patch | 28 ++ build/patches/fix_zrpcd_make_dist.patch | 29 ++ build/patches/zrpcd_hardcoded_paths.patch | 58 +++ build/rpm_specs/c_capnproto.spec | 45 ++ build/rpm_specs/quagga.spec | 748 ++++++++++++++++++++++++++++++ build/rpm_specs/zrpc.spec | 46 ++ build/variables.sh | 2 + lib/overcloud-deploy-functions.sh | 9 + lib/post-install-functions.sh | 5 + 12 files changed, 1289 insertions(+), 1 deletion(-) create mode 100755 build/build_quagga.sh create mode 100644 build/patches/fix_quagga_make_dist.patch create mode 100644 build/patches/fix_zrpcd_make_dist.patch create mode 100644 build/patches/zrpcd_hardcoded_paths.patch create mode 100644 build/rpm_specs/c_capnproto.spec create mode 100644 build/rpm_specs/quagga.spec create mode 100644 build/rpm_specs/zrpc.spec diff --git a/build/Makefile b/build/Makefile index fb0d0c32..3a26b4cb 100644 --- a/build/Makefile +++ b/build/Makefile @@ -36,6 +36,9 @@ export RPMVERS = $(shell grep Version $(shell pwd)/rpm_specs/opnfv-apex.spec | h export BUILD_ROOT = $(shell pwd) export BUILD_DIR = $(shell dirname $$(pwd))/.build export CACHE_DIR = $(shell dirname $$(pwd))/.cache +export PATCHES_DIR = $(BUILD_ROOT)/patches +export QUAGGA_BUILD_DIR = $(BUILD_DIR)/quagga_build_dir +export QUAGGA_RPMS_DIR = $(QUAGGA_BUILD_DIR)/rpmbuild export RPM_DIR_ARGS = -D '_topdir $(BUILD_DIR)' -D '_builddir $(BUILD_DIR)' -D '_sourcedir $(BUILD_DIR)' -D '_rpmdir $(BUILD_DIR)' -D '_specdir $(BUILD_DIR)' -D '_srcrpmdir $(BUILD_DIR)' export RPMREL = $(BUILD_DIR)/noarch/opnfv-apex-release-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm @@ -242,7 +245,7 @@ $(BUILD_DIR)/overcloud-full.qcow2: congress-rpm tacker-rpm networking-vpp-rpm ############### .PHONY: overcloud-opendaylight -overcloud-opendaylight: $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 +overcloud-opendaylight: quagga-zrpc $(BUILD_DIR)/overcloud-full-opendaylight.qcow2 $(BUILD_DIR)/overcloud-full-opendaylight.qcow2: $(BUILD_DIR)/overcloud-full.qcow2 @echo "Building the Apex OpenDaylight Overcloud Image" @@ -369,3 +372,58 @@ python3-markupsafe: && sed -i 's/python3-pytest/python34-pytest/' python-markupsafe.spec \ && sed -i 's/python3-markupsafe/python34-markupsafe/' python-markupsafe.spec \ && rpmbuild -ba python-markupsafe.spec $(RPM_DIR_ARGS) -D "with_python3 1" + +################## +# Quagga Clean # +################## +.PHONY: quagga-clean +quagga-clean: + @rm -rf $(QUAGGA_BUILD_DIR) + @sudo yum -y remove zrpc* quagga* c-capnproto* thrift* + +################# +# Quagga+ZRPC # +################# +.PHONY: quagga-zrpc +quagga-zrpc: quagga-clean thrift-rpm capnproto-rpm quagga-rpm zrpc-rpm + +########## +# ZRPC # +########## +.PHONY: zrpc-rpm +zrpc-rpm: quagga-rpm $(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm + +$(QUAGGA_RPMS_DIR)/zrpcd-%.x86_64.rpm: + @echo "Building ZRPC RPM" + @./build_quagga.sh -a zrpc + +############ +# Quagga # +############ +.PHONY: quagga-rpm +quagga-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm + +$(QUAGGA_RPMS_DIR)/RPMS/x86_64/quagga-1.1.0_%.el7.centos.x86_64.rpm: + @echo "Building Quagga RPM" + @./build_quagga.sh -a quagga + +############### +# Capnproto # +############### +.PHONY: capnproto-rpm +capnproto-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm + +$(QUAGGA_RPMS_DIR)/RPMS/x86_64/c-capnproto-%.x86_64.rpm: + @echo "Building capnproto RPMs" + @./build_quagga.sh -a capnproto + +############ +# Thrift # +############ + +.PHONY: thrift-rpm +thrift-rpm: $(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm + +$(QUAGGA_RPMS_DIR)/RPMS/x86_64/thrift-%.x86_64.rpm: + @echo "Building Thrift RPMs" + @./build_quagga.sh -a thrift diff --git a/build/build_quagga.sh b/build/build_quagga.sh new file mode 100755 index 00000000..7d298e57 --- /dev/null +++ b/build/build_quagga.sh @@ -0,0 +1,250 @@ +#!/usr/bin/env bash +############################################################################## +# Copyright (c) 2017 Tim Rozet (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -xe + +ARTIFACT=None + +# Builds Quagga, Zebra and other dependency RPMs for CentOS 7 +# Install package dependencies +install_quagga_build_deps() { + sudo yum -y install automake bison flex libtool make readline-devel \ + texinfo texi2html rpm-build libcap-devel groff net-snmp-devel pam-devel glib2 glib2-devel epel-release spectool \ + wget git gcc-c++ openssl-devel boost-devel boost-static gtest zeromq-4.1.4 zeromq-devel-4.1.4 \ + capnproto-devel capnproto-libs capnproto + sudo yum -y groupinstall "Development Tools" +} + +display_usage () +{ +cat << EOF +$0 Builds Quagga/ZRPC and Dependency RPMs + +usage: $0 [ [-a | --artifact] artifact ] + +OPTIONS: + -a artifact to build (thrift, capnproto, quagga, zrpc). Default: All artifacts. + -c clean all build directories + -h help, prints this help text + +Example: +build_quagga.sh -a thrift +EOF +} + +parse_cmdline() { + while [ "${1:0:1}" = "-" ] + do + case "$1" in + -h|--help) + display_usage + exit 0 + ;; + -a|--artifact) + ARTIFACT=${2} + shift 2 + ;; + -c|--clean) + CLEAN="True" + shift 1 + ;; + *) + display_usage + exit 1 + ;; + esac + done + +} + +# Removes build directory folder and re-creates RPM DIRs to use +function quagga_clean(){ + rm -rf ${QUAGGA_BUILD_DIR} + sudo yum remove -y zrpc* quagga* thrift* c-capnproto* +} + +# Build Thrift RPM +function build_thrift(){ + rm -rf thrift + git clone https://git-wip-us.apache.org/repos/asf/thrift.git + pushd thrift + git checkout 0.10.0 + wget https://issues.apache.org/jira/secure/attachment/12840511/0002-THRIFT-3986-using-autoreconf-i-fails-because-of-miss.patch + wget https://issues.apache.org/jira/secure/attachment/12840512/0001-THRIFT-3987-externalise-declaration-of-thrift-server.patch + patch -p1 < 0002-THRIFT-3986-using-autoreconf-i-fails-because-of-miss.patch + patch -p1 < 0001-THRIFT-3987-externalise-declaration-of-thrift-server.patch + autoreconf -i + ./configure --without-qt4 --without-qt5 --without-csharp --without-java \ + --without-erlang --without-nodejs --without-perl --without-python \ + --without-php --without-php_extension --without-dart --without-ruby \ + --without-haskell --without-go --without-haxe --without-d + # Hack somehow the testing file of php is not there + # We will disable php anyhow later on. + touch lib/php/src/ext/thrift_protocol/run-tests.php + make dist + pushd contrib/ + spectool -g -R thrift.spec + mv ../thrift-*.tar.gz $rpmbuild/SOURCES/ + rpmbuild --define "_topdir $rpmbuild" -ba thrift.spec --define "without_ruby 1" --define "without-php 1" + popd > /dev/null + popd > /dev/null +} + +# c-capnproto RPM +# This is a library for capnproto in C. Not to be confused with +# the capnproto provided by the repos +function build_capnproto(){ + rm -rf c-capnproto + git clone https://github.com/opensourcerouting/c-capnproto + pushd c-capnproto + git checkout 332076e52257 + autoreconf -i + ./configure --without-gtest + make dist + + cp ${BUILD_ROOT}/rpm_specs/c_capnproto.spec $rpmbuild/SPECS/ + cp c-capnproto-*.tar.gz $rpmbuild/SOURCES/ + rpmbuild --define "_topdir $rpmbuild" -ba $rpmbuild/SPECS/c_capnproto.spec + popd > /dev/null +} + +build_quagga(){ + # Build Quagga + rm -rf quagga + sudo yum -y install $rpmbuild/RPMS/x86_64/*.rpm + git clone https://github.com/6WIND/quagga.git + pushd quagga > /dev/null + # checkout the parent of the bellow patch. + # Once the issue addressed by the patch is fixed + # these two lines can be removed. + git checkout 95bb0f4a + patch -p1 < ${PATCHES_DIR}/fix_quagga_make_dist.patch + autoreconf -i + ./configure --with-zeromq --with-ccapnproto --enable-user=quagga \ + --enable-group=quagga --enable-vty-group=quagga \ + --disable-doc --enable-multipath=64 + + # Quagga RPM + make dist + cp ${BUILD_ROOT}/rpm_specs/quagga.spec $rpmbuild/SPECS/ + cp quagga*.tar.gz $rpmbuild/SOURCES/ + cat > $rpmbuild/SOURCES/bgpd.conf < /dev/null +} + +# Build ZPRC +build_zrpc(){ + sudo yum -y install $rpmbuild/RPMS/x86_64/*.rpm + rm -rf zrpcd + git clone https://github.com/6WIND/zrpcd.git + pushd zrpcd > /dev/null + touch NEWS README + export QUAGGA_CFLAGS='-I/usr/include/quagga/' + # checkout the parent of the bellow patch. + # Once the issue addressed by the patch is fixed + # these two lines can be removed. + git checkout 9bd1ee8e + patch -p1 < ${PATCHES_DIR}/fix_zrpcd_make_dist.patch + patch -p1 < ${PATCHES_DIR}/zrpcd_hardcoded_paths.patch + autoreconf -i + + # ZRPC RPM + ./configure --enable-zrpcd \ + --enable-user=quagga --enable-group=quagga \ + --enable-vty-group=quagga + make dist + + cat > $rpmbuild/SOURCES/zrpcd.service < /dev/null + +case "$ARTIFACT" in + thrift) + build_thrift + ;; + capnproto) + build_capnproto + ;; + quagga) + build_quagga + ;; + zrpc) + build_zrpc + ;; + *) + build_thrift + build_capnproto + build_quagga + build_zprc + ;; +esac + +popd > /dev/null diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index af745f18..66bf53a7 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -71,10 +71,16 @@ pushd netready/ > /dev/null git archive --format=tar.gz HEAD:deploy/puppet/ > ${BUILD_DIR}/puppet-gluon.tar.gz popd > /dev/null +# Tar up all quagga/zrpc rpms +pushd ${QUAGGA_RPMS_DIR}/rpmbuild/RPMS > /dev/null +tar --transform "s/^x86_64/quagga/" -czvf ${BUILD_DIR}/quagga.tar.gz x86_64/ +popd > /dev/null + # install ODL packages # install Jolokia for ODL HA # Patch in OPNFV custom puppet-tripleO # install Honeycomb +# install quagga/zrpc LIBGUESTFS_BACKEND=direct virt-customize \ --upload ${BUILD_DIR}/opendaylight_boron.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "yum install --downloadonly --downloaddir=/root/boron/ opendaylight" \ @@ -96,6 +102,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install epel-release \ --install python-click \ --install http://artifacts.opnfv.org/netready/gluon-0.0.1-1_20170216.noarch.rpm \ + --upload ${BUILD_DIR}/quagga.tar.gz:/root/ \ + --run-command "cd /root/ && tar xzf quagga.tar.gz" \ + --install zeromq-4.1.4,zeromq-devel-4.1.4 \ + --install capnproto-devel,capnproto-libs,capnproto \ -a overcloud-full-opendaylight_build.qcow2 mv overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 diff --git a/build/patches/fix_quagga_make_dist.patch b/build/patches/fix_quagga_make_dist.patch new file mode 100644 index 00000000..8f854e50 --- /dev/null +++ b/build/patches/fix_quagga_make_dist.patch @@ -0,0 +1,28 @@ +From c31749157aabca758ef731ad4d15ddf4cc2efe66 Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas +Date: Mon, 6 Feb 2017 15:28:44 +0200 +Subject: [PATCH] lib: Include missing ccapnproto header in Makefile + +Without this make dist doesn't include the header and the resulting +archive doesn't build. + +Signed-off-by: Romanos Skiadas +--- + lib/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index c286833..c7682ed 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -43,6 +43,7 @@ endif + if HAVE_CCAPNPROTO + libzebra_la_SOURCES += qzc.capnp.c + BUILT_SOURCES += qzc.capnp.c ++pkginclude_HEADERS += qzc.capnp.h + endif + + EXTRA_DIST = \ +-- +1.8.3.1 + diff --git a/build/patches/fix_zrpcd_make_dist.patch b/build/patches/fix_zrpcd_make_dist.patch new file mode 100644 index 00000000..a0f65b7f --- /dev/null +++ b/build/patches/fix_zrpcd_make_dist.patch @@ -0,0 +1,29 @@ +From ad66cdee4ffe8225d4534137734cf62944ce45c8 Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas +Date: Mon, 6 Feb 2017 18:43:12 +0000 +Subject: [PATCH] make dist: Include all headers required for compilation + +Some headers where missing from the archive resulting from 'make dist'. + +Signed-off-by: Romanos Skiadas +--- + zrpcd/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/zrpcd/Makefile.am b/zrpcd/Makefile.am +index 50db7fa..f4081d3 100644 +--- a/zrpcd/Makefile.am ++++ b/zrpcd/Makefile.am +@@ -18,6 +18,9 @@ libzrpc_a_SOURCES = \ + qzmqclient.c qzcclient.capnp.c qzcclient.c zrpc_util.c \ + zrpc_bgp_capnp.c + ++pkginclude_HEADERS = \ ++ zrpc_os_wrapper.h zrpc_global.h ++ + noinst_HEADERS = \ + bgp_configurator.h bgp_updater.h vpnservice_types.h zrpc_bgp_updater.h \ + zrpc_bgp_configurator.h zrpc_bgp_updater.h zrpc_debug.h zrpc_memory.h \ +-- +1.8.3.1 + diff --git a/build/patches/zrpcd_hardcoded_paths.patch b/build/patches/zrpcd_hardcoded_paths.patch new file mode 100644 index 00000000..27115ca7 --- /dev/null +++ b/build/patches/zrpcd_hardcoded_paths.patch @@ -0,0 +1,58 @@ +From 48125816cf99b03f20496bce06850f05cdf2914a Mon Sep 17 00:00:00 2001 +From: Romanos Skiadas +Date: Fri, 10 Feb 2017 12:48:46 +0000 +Subject: [PATCH] Change hardcoded paths + +The path to the bgpd executable and bgpd's pid file were hardcoded +and not correct when zrpcd is packaged for Apex. +This patch is a temporary fix until the paths are no longer hardcoded +in the upstream project. +--- + zrpcd/zrpc_vpnservice.c | 8 +------- + zrpcd/zrpc_vpnservice.h | 4 ++-- + 2 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/zrpcd/zrpc_vpnservice.c b/zrpcd/zrpc_vpnservice.c +index a9de91d..28c8293 100644 +--- a/zrpcd/zrpc_vpnservice.c ++++ b/zrpcd/zrpc_vpnservice.c +@@ -217,20 +217,14 @@ static void zrpc_vpnservice_callback (void *arg, void *zmqsock, struct zmq_msg_t + return; + } + +-#define SBIN_DIR "/sbin" + + void zrpc_vpnservice_setup(struct zrpc_vpnservice *setup) + { +- char bgpd_location_path[128]; +- char *ptr = bgpd_location_path; +- + setup->zrpc_listen_port = ZRPC_LISTEN_PORT; + setup->zrpc_notification_port = ZRPC_NOTIFICATION_PORT; + setup->zmq_sock = ZRPC_STRDUP(ZMQ_SOCK); + setup->zmq_subscribe_sock = ZRPC_STRDUP(ZMQ_NOTIFY); +- ptr+=sprintf(ptr, "%s", BGPD_PATH_QUAGGA); +- ptr+=sprintf(ptr, "%s/bgpd",SBIN_DIR); +- setup->bgpd_execution_path = ZRPC_STRDUP(bgpd_location_path); ++ setup->bgpd_execution_path = ZRPC_STRDUP(BGPD_EXECUTION_PATH); + } + + void zrpc_vpnservice_terminate(struct zrpc_vpnservice *setup) +diff --git a/zrpcd/zrpc_vpnservice.h b/zrpcd/zrpc_vpnservice.h +index 12863a4..96331e2 100644 +--- a/zrpcd/zrpc_vpnservice.h ++++ b/zrpcd/zrpc_vpnservice.h +@@ -21,8 +21,8 @@ + #define BGPD_ARGS_STRING_1 "-p" + #define BGPD_ARGS_STRING_3 "-Z" + +-#define BGPD_PATH_BGPD_PID "/opt/quagga/var/run/quagga/bgpd.pid" +-#define BGPD_PATH_QUAGGA "/opt/quagga" ++#define BGPD_PATH_BGPD_PID "/var/run/quagga/bgpd.pid" ++#define BGPD_EXECUTION_PATH "/usr/sbin/bgpd" + + #define ZRPC_CONFIG_FILE "zrpcd.conf" + +-- +1.8.3.1 + diff --git a/build/rpm_specs/c_capnproto.spec b/build/rpm_specs/c_capnproto.spec new file mode 100644 index 00000000..2d95494c --- /dev/null +++ b/build/rpm_specs/c_capnproto.spec @@ -0,0 +1,45 @@ +Name: c-capnproto +Version: 0.1 +Release: 0 +Summary: C library/compiler for the Cap'n Proto serialization/RPC protocol + +Group: System Environment +License: Apache 2.0 +URL: https://gerrit.opnfv.org/gerrit/apex.git +Source0: %{name}-%{version}.tar.gz + +Provides: c_capnproto + +%description +C library/compiler for the Cap'n Proto serialization/RPC protocol + +%prep +%setup -q + +%build +%configure --without-gtest + +%install +rm -rf $RPM_BUILD_ROOT +%make_install +find %{buildroot} -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/c-capnproto/ +# These are the headers/libs quagga/zrpcd link against +install -m 700 $RPM_BUILD_ROOT/%{_includedir}/capn.h $RPM_BUILD_ROOT/%{_includedir}/c-capnproto/ +install -m 700 $RPM_BUILD_ROOT/%{_libdir}/libcapn.so $RPM_BUILD_ROOT/%{_libdir}/libcapn_c.so + +%files +%defattr(644,root,root) +%{_bindir}/capnpc-c +%{_includedir}/capn.h +%{_includedir}/c-capnproto/capn.h +%{_libdir}/libcapn.so* +%{_libdir}/libcapn_c.so + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%changelog +* Mon Jan 23 2017 Tim Rozet - 1.0-1 +- Initial version diff --git a/build/rpm_specs/quagga.spec b/build/rpm_specs/quagga.spec new file mode 100644 index 00000000..c129e0a2 --- /dev/null +++ b/build/rpm_specs/quagga.spec @@ -0,0 +1,748 @@ +# configure options +# +# Some can be overriden on rpmbuild commandline with: +# rpmbuild --define 'variable value' +# (use any value, ie 1 for flag "with_XXXX" definitions) +# +# E.g. rpmbuild --define 'release_rev 02' may be useful if building +# rpms again and again on the same day, so the newer rpms can be installed. +# bumping the number each time. + +####################### Quagga configure options ######################### +# with-feature options +%{!?with_snmp: %global with_snmp 1 } +%{!?with_vtysh: %global with_vtysh 1 } +%{!?with_tcp_zebra: %global with_tcp_zebra 0 } +%{!?with_vtysh: %global with_vtysh 1 } +%{!?with_pam: %global with_pam 1 } +%{!?with_ospfclient: %global with_ospfclient 1 } +%{!?with_ospfapi: %global with_ospfapi 1 } +%{!?with_irdp: %global with_irdp 1 } +%{!?with_rtadv: %global with_rtadv 1 } +%{!?with_isisd: %global with_isisd 1 } +%{!?with_pimd: %global with_pimd 1 } +%{!?with_shared: %global with_shared 1 } +%{!?with_multipath: %global with_multipath 64 } +%{!?quagga_user: %global quagga_user quagga } +%{!?vty_group: %global vty_group quaggavt } +%{!?with_fpm: %global with_fpm 0 } +%{!?with_watchquagga: %global with_watchquagga 1 } + +# path defines +%define _sysconfdir /etc/quagga +%define zeb_src %{_builddir}/%{name}-%{quaggaversion} +%define zeb_rh_src %{zeb_src}/redhat +%define zeb_docs %{zeb_src}/doc + +# defines for configure +%define _localstatedir /var/run/quagga +############################################################################ + +#### Version String tweak +# Remove invalid characters form version string and replace with _ +%{expand: %%define rpmversion %(echo '1.1.0-dev' | tr [:blank:]- _ )} +%define quaggaversion 1.1.0-dev + +#### Check version of texi2html +# Old versions don't support "--number-footnotes" option. +%{expand: %%global texi2htmlversion %(rpm -q --qf '%%{VERSION}' texi2html | cut -d. -f1 )} + +#### Check for systemd or init.d (upstart) +# Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7) +%{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)} +# +# If init system is systemd, then always disable watchquagga +# +%if "%{initsystem}" == "systemd" + # Note: For systems with systemd, watchquagga will NOT be built. Systemd + # takes over the role of restarting crashed processes. Value will + # be overwritten with 0 below for systemd independent on the setting here + %global with_watchquagga 0 +%endif + +# if FPM is enabled, then enable tcp_zebra as well +# +%if %{with_fpm} + %global with_tcp_zebra 1 +%endif + +# misc internal defines +%{!?quagga_uid: %define quagga_uid 92 } +%{!?quagga_gid: %define quagga_gid 92 } +%{!?vty_gid: %define vty_gid 85 } + +%define daemon_list zebra ripd ospfd bgpd + +%define daemonv6_list ripngd ospf6d + +%if %{with_isisd} +%define daemon_isisd isisd +%else +%define daemon_isisd "" +%endif + +%if %{with_pimd} +%define daemon_pimd pimd +%else +%define daemon_pimd "" +%endif + +%if %{with_watchquagga} +%define daemon_watchquagga watchquagga +%else +%define daemon_watchquagga "" +%endif + +%define all_daemons %{daemon_list} %{daemonv6_list} %{daemon_isisd} %{daemon_pimd} %{daemon_watchquagga} + +# allow build dir to be kept +%{!?keep_build: %global keep_build 0 } + +#release sub-revision (the two digits after the CONFDATE) +%{!?release_rev: %define release_rev 01 } + +Summary: Routing daemon +Name: quagga +Version: %{rpmversion} +Release: 20170120%{release_rev}%{?dist} +License: GPLv2+ +Group: System Environment/Daemons +Source0: quagga-1.1.0-dev.tar.gz +Source1: bgpd.conf +URL: http://www.quagga.net +Requires: ncurses +Requires(pre): /sbin/install-info +Requires(preun): /sbin/install-info +Requires(post): /sbin/install-info +BuildRequires: texi2html texinfo autoconf patch libcap-devel groff +%if %{with_snmp} +BuildRequires: net-snmp-devel +Requires: net-snmp +%endif +%if %{with_vtysh} +BuildRequires: readline readline-devel ncurses ncurses-devel +Requires: ncurses +%endif +%if %{with_pam} +BuildRequires: pam-devel +Requires: pam +%endif +%if "%{initsystem}" == "systemd" +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +# Initscripts > 5.60 is required for IPv6 support +Requires(pre): initscripts >= 5.60 +%endif +Provides: routingdaemon = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: bird gated mrt zebra quagga-sysvinit + +%description +Quagga is a free software that manages TCP/IP based routing +protocol. It takes multi-server and multi-thread approach to resolve +the current complexity of the Internet. + +Quagga supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng and PIM. + +Quagga is intended to be used as a Route Server and a Route Reflector. It is +not a toolkit, it provides full routing power under a new architecture. +Quagga by design has a process for each protocol. + +Quagga is a fork of GNU Zebra. + +%package contrib +Summary: contrib tools for quagga +Group: System Environment/Daemons + +%description contrib +Contributed/3rd party tools which may be of use with quagga. + +%package devel +Summary: Header and object files for quagga development +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description devel +The quagga-devel package contains the header and object files neccessary for +developing OSPF-API and quagga applications. + +%prep +%setup -q -n quagga-%{quaggaversion} + +%build + +# For standard gcc verbosity, uncomment these lines: +#CFLAGS="%{optflags} -Wall -Wsign-compare -Wpointer-arith" +#CFLAGS="${CFLAGS} -Wbad-function-cast -Wwrite-strings" + +# For ultra gcc verbosity, uncomment these lines also: +#CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes" +#CFLAGS="${CFLAGS} -Wmissing-declarations -Wmissing-noreturn" +#CFLAGS="${CFLAGS} -Wmissing-format-attribute -Wunreachable-code" +#CFLAGS="${CFLAGS} -Wpacked -Wpadded" + +%configure \ + --sysconfdir=%{_sysconfdir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libexecdir} \ + --localstatedir=%{_localstatedir} \ + --disable-werror \ +%if !%{with_shared} + --disable-shared \ +%endif +%if %{with_snmp} + --enable-snmp \ +%endif +%if %{with_multipath} + --enable-multipath=%{with_multipath} \ +%endif +%if %{with_tcp_zebra} + --enable-tcp-zebra \ +%endif +%if %{with_vtysh} + --enable-vtysh \ +%endif +%if %{with_ospfclient} + --enable-ospfclient=yes \ +%else + --enable-ospfclient=no\ +%endif +%if %{with_ospfapi} + --enable-ospfapi=yes \ +%else + --enable-ospfapi=no \ +%endif +%if %{with_irdp} + --enable-irdp=yes \ +%else + --enable-irdp=no \ +%endif +%if %{with_rtadv} + --enable-rtadv=yes \ +%else + --enable-rtadv=no \ +%endif +%if %{with_isisd} + --enable-isisd \ +%else + --disable-isisd \ +%endif +%if %{with_pam} + --with-libpam \ +%endif +%if 0%{?quagga_user:1} + --enable-user=%quagga_user \ + --enable-group=%quagga_user \ +%endif +%if 0%{?vty_group:1} + --enable-vty-group=%vty_group \ +%endif +%if %{with_fpm} + --enable-fpm \ +%else + --disable-fpm \ +%endif +%if %{with_watchquagga} + --enable-watchquagga \ +%else + --disable-watchquagga \ +%endif + --enable-gcc-rdynamic \ + --with-ccapnproto \ + --with-zeromq + +make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" + +pushd doc +%if %{texi2htmlversion} < 5 +texi2html --number-sections quagga.texi +%else +texi2html --number-footnotes --number-sections quagga.texi +%endif +popd + +%install +mkdir -p %{buildroot}/etc/{quagga,sysconfig,logrotate.d,pam.d} \ + %{buildroot}/var/log/quagga %{buildroot}%{_infodir} +make DESTDIR=%{buildroot} INSTALL="install -p" CP="cp -p" install +install %{SOURCE1} %{buildroot}/etc/quagga/bgpd.conf + +# Remove this file, as it is uninstalled and causes errors when building on RH9 +rm -rf %{buildroot}/usr/share/info/dir + +# install /etc sources +%if "%{initsystem}" == "systemd" +mkdir -p %{buildroot}%{_unitdir} +for daemon in %{all_daemons} ; do + if [ x"${daemon}" != x"" ] ; then + install %{zeb_rh_src}/${daemon}.service \ + %{buildroot}%{_unitdir}/${daemon}.service + fi +done +%else +mkdir -p %{buildroot}/etc/rc.d/init.d +for daemon in %{all_daemons} ; do + if [ x"${daemon}" != x"" ] ; then + install %{zeb_rh_src}/${daemon}.init \ + %{buildroot}/etc/rc.d/init.d/${daemon} + fi +done +%endif + +install -m644 %{zeb_rh_src}/quagga.pam \ + %{buildroot}/etc/pam.d/quagga +install -m644 %{zeb_rh_src}/quagga.logrotate \ + %{buildroot}/etc/logrotate.d/quagga +install -m644 %{zeb_rh_src}/quagga.sysconfig \ + %{buildroot}/etc/sysconfig/quagga +install -d -m750 %{buildroot}/var/run/quagga + +%pre +# add vty_group +%if 0%{?vty_group:1} +if getent group %vty_group > /dev/null ; then : ; else \ + /usr/sbin/groupadd -r -g %vty_gid %vty_group > /dev/null || : ; fi +%endif + +# add quagga user and group +%if 0%{?quagga_user:1} +# Ensure that quagga_gid gets correctly allocated +if getent group %quagga_user >/dev/null; then : ; else \ + /usr/sbin/groupadd -g %quagga_gid %quagga_user > /dev/null || : ; \ +fi +if getent passwd %quagga_user >/dev/null ; then : ; else \ + /usr/sbin/useradd -u %quagga_uid -g %quagga_gid \ + -M -r -s /sbin/nologin -c "Quagga routing suite" \ + -d %_localstatedir %quagga_user 2> /dev/null || : ; \ +fi +%endif + +%post +# zebra_spec_add_service +# e.g. zebra_spec_add_service zebrasrv 2600/tcp "zebra service" + +zebra_spec_add_service () +{ + # Add port /etc/services entry if it isn't already there + if [ -f /etc/services ] && \ + ! %__sed -e 's/#.*$//' /etc/services | %__grep -wq $1 ; then + echo "$1 $2 # $3" >> /etc/services + fi +} + +zebra_spec_add_service zebrasrv 2600/tcp "zebra service" +zebra_spec_add_service zebra 2601/tcp "zebra vty" +zebra_spec_add_service ripd 2602/tcp "RIPd vty" +zebra_spec_add_service ripngd 2603/tcp "RIPngd vty" +zebra_spec_add_service ospfd 2604/tcp "OSPFd vty" +zebra_spec_add_service bgpd 2605/tcp "BGPd vty" +zebra_spec_add_service ospf6d 2606/tcp "OSPF6d vty" +%if %{with_ospfapi} +zebra_spec_add_service ospfapi 2607/tcp "OSPF-API" +%endif +%if %{with_isisd} +zebra_spec_add_service isisd 2608/tcp "ISISd vty" +%endif +%if %{with_pimd} +zebra_spec_add_service pimd 2611/tcp "PIMd vty" +%endif + +%if "%{initsystem}" == "systemd" +for daemon in %all_daemons ; do + %systemd_post ${daemon}.service +done +%else +for daemon in %all_daemons ; do + /sbin/chkconfig --add ${daemon} +done +%endif + +/sbin/install-info %{_infodir}/quagga.info.gz %{_infodir}/dir + +# Create dummy files if they don't exist so basic functions can be used. +if [ ! -e %{_sysconfdir}/zebra.conf ]; then + echo "hostname `hostname`" > %{_sysconfdir}/zebra.conf +%if 0%{?quagga_user:1} + chown %quagga_user:%quagga_user %{_sysconfdir}/zebra.conf* +%endif + chmod 640 %{_sysconfdir}/zebra.conf +fi +for daemon in %{all_daemons} ; do + if [ ! -e %{_sysconfdir}/${daemon}.conf ]; then + touch %{_sysconfdir}/${daemon}.conf + %if 0%{?quagga_user:1} + chown %quagga_user:%quagga_user %{_sysconfdir}/${daemon}.conf* + %endif + fi +done +%if %{with_watchquagga} + # No config for watchquagga - this is part of /etc/sysconfig/quagga + rm -f %{_sysconfdir}/watchquagga.* +%endif + +if [ ! -e %{_sysconfdir}/vtysh.conf ]; then + touch %{_sysconfdir}/vtysh.conf + chmod 640 %{_sysconfdir}/vtysh.conf +%if 0%{?vty_group:1} + chown quagga:%{vty_group} %{_sysconfdir}/vtysh.conf* +%endif +fi + +%postun +if [ "$1" -ge 1 ]; then + # Find out which daemons need to be restarted. + for daemon in %all_daemons ; do + if [ -f /var/lock/subsys/${daemon} ]; then + eval restart_${daemon}=yes + else + eval restart_${daemon}=no + fi + done + # Rename restart flags for daemons handled specially. + running_zebra="$restart_zebra" + restart_zebra=no + %if %{with_watchquagga} + running_watchquagga="$restart_watchquagga" + restart_watchquagga=no + %endif + + %if "%{initsystem}" == "systemd" + ## + ## Systemd Version + ## + # No watchquagga for systemd version + # + # Stop all daemons other than zebra. + for daemon in %all_daemons ; do + eval restart=\$restart_${daemon} + [ "$restart" = yes ] && \ + %systemd_postun ${daemon}.service + done + # Restart zebra. + [ "$running_zebra" = yes ] && \ + %systemd_postun_with_restart $daemon.service + # Start all daemons other than zebra. + for daemon in %all_daemons ; do + eval restart=\$restart_${daemon} + [ "$restart" = yes ] && \ + %systemd_post ${daemon}.service + done + %else + ## + ## init.d Version + ## + %if %{with_watchquagga} + # Stop watchquagga first. + [ "$running_watchquagga" = yes ] && \ + /etc/rc.d/init.d/watchquagga stop >/dev/null 2>&1 + %endif + # Stop all daemons other than zebra and watchquagga. + for daemon in %all_daemons ; do + eval restart=\$restart_${daemon} + [ "$restart" = yes ] && \ + /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1 + done + # Restart zebra. + [ "$running_zebra" = yes ] && \ + /etc/rc.d/init.d/zebra restart >/dev/null 2>&1 + # Start all daemons other than zebra and watchquagga. + for daemon in %all_daemons ; do + eval restart=\$restart_${daemon} + [ "$restart" = yes ] && \ + /etc/rc.d/init.d/${daemon} start >/dev/null 2>&1 + done + %if %{with_watchquagga} + # Start watchquagga last. + # Avoid postun scriptlet error if watchquagga is not running. + [ "$running_watchquagga" = yes ] && \ + /etc/rc.d/init.d/watchquagga start >/dev/null 2>&1 || : + %endif + %endif +fi + +%preun +%if "%{initsystem}" == "systemd" + ## + ## Systemd Version + ## + if [ "$1" = "0" ]; then + for daemon in %all_daemons ; do + %systemd_preun ${daemon}.service + done + fi +%else + ## + ## init.d Version + ## + if [ "$1" = "0" ]; then + for daemon in %all_daemons ; do + /etc/rc.d/init.d/${daemon} stop >/dev/null 2>&1 + /sbin/chkconfig --del ${daemon} + done + fi +%endif +/sbin/install-info --delete %{_infodir}/quagga.info.gz %{_infodir}/dir + +%clean +%if !0%{?keep_build:1} +rm -rf %{buildroot} +%endif + +%files +%defattr(-,root,root) +%doc */*.sample* AUTHORS COPYING +%doc doc/quagga.html +%doc doc/mpls +%doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO +%if 0%{?quagga_user:1} +%dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir} +%dir %attr(750,%quagga_user,%quagga_user) /var/log/quagga +%dir %attr(751,%quagga_user,%quagga_user) /var/run/quagga +%attr(750,%quagga_user,%quagga_user) %{_sysconfdir}/bgpd.conf +%else +%dir %attr(750,root,root) %{_sysconfdir} +%dir %attr(750,root,root) /var/log/quagga +%dir %attr(750,root,root) /var/run/quagga +%endif +%if 0%{?vty_group:1} +%attr(750,%quagga_user,%vty_group) %{_sysconfdir}/vtysh.conf.sample +%endif +%{_infodir}/quagga.info.gz +%{_mandir}/man*/* +%{_sbindir}/zebra +%{_sbindir}/ospfd +%{_sbindir}/ripd +%{_sbindir}/bgpd +%if %{with_watchquagga} + %{_sbindir}/watchquagga +%endif +%{_sbindir}/ripngd +%{_sbindir}/ospf6d +%if %{with_pimd} +%{_sbindir}/pimd +%endif +%if %{with_isisd} +%{_sbindir}/isisd +%endif +%if %{with_shared} +%attr(755,root,root) %{_libdir}/lib*.so +%attr(755,root,root) %{_libdir}/lib*.so.* +%endif +%if %{with_vtysh} +%{_bindir}/* +%endif +%config /etc/quagga/[!v]* +%if "%{initsystem}" == "systemd" + %config %{_unitdir}/*.service +%else + %config /etc/rc.d/init.d/zebra + %if %{with_watchquagga} + %config /etc/rc.d/init.d/watchquagga + %endif + %config /etc/rc.d/init.d/ripd + %config /etc/rc.d/init.d/ospfd + %config /etc/rc.d/init.d/bgpd + %config /etc/rc.d/init.d/ripngd + %config /etc/rc.d/init.d/ospf6d + %if %{with_isisd} + %config /etc/rc.d/init.d/isisd + %endif + %if %{with_pimd} + %config /etc/rc.d/init.d/pimd + %endif +%endif +%config(noreplace) /etc/sysconfig/quagga +%config(noreplace) /etc/pam.d/quagga +%config(noreplace) %attr(640,root,root) /etc/logrotate.d/* + +%files contrib +%defattr(-,root,root) +%doc tools + +%files devel +%defattr(-,root,root) +%if %{with_ospfclient} +%{_sbindir}/ospfclient +%endif +%{_libdir}/*.a +%{_libdir}/*.la +%dir %attr(755,root,root) %{_includedir}/%{name} +%{_includedir}/%name/*.h +%dir %attr(755,root,root) %{_includedir}/%{name}/ospfd +%{_includedir}/%name/ospfd/*.h +%if %{with_ospfapi} +%dir %attr(755,root,root) %{_includedir}/%{name}/ospfapi +%{_includedir}/%name/ospfapi/*.h +%endif + +%changelog +* Thu Feb 11 2016 Paul Jakma - %{version} +- remove with_ipv6 conditionals, always build v6 +- Fix UTF-8 char in spec changelog +- remove quagga.pam.stack, long deprecated. + +* Thu Oct 22 2015 Martin Winter +- Cleanup configure: remove --enable-ipv6 (default now), --enable-nssa, + --enable-netlink +- Remove support for old fedora 4/5 +- Fix for package nameing +- Fix Weekdays of previous changelogs (bogus dates) +- Add conditional logic to only build tex footnotes with supported texi2html +- Added pimd to files section and fix double listing of /var/lib*/quagga +- Numerous fixes to unify upstart/systemd startup into same spec file +- Only allow use of watchquagga for non-systemd systems. no need with systemd + +* Fri Sep 4 2015 Paul Jakma +- buildreq updates +- add a default define for with_pimd + +* Mon Sep 12 2005 Paul Jakma +- Steal some changes from Fedora spec file: +- Add with_rtadv variable +- Test for groups/users with getent before group/user adding +- Readline need not be an explicit prerequisite +- install-info delete should be postun, not preun + +* Wed Jan 12 2005 Andrew J. Schorr +- on package upgrade, implement careful, phased restart logic +- use gcc -rdynamic flag when linking for better backtraces + +* Wed Dec 22 2004 Andrew J. Schorr +- daemonv6_list should contain only IPv6 daemons + +* Wed Dec 22 2004 Andrew J. Schorr +- watchquagga added +- on upgrade, all daemons should be condrestart'ed +- on removal, all daemons should be stopped + +* Mon Nov 08 2004 Paul Jakma +- Use makeinfo --html to generate quagga.html + +* Sun Nov 07 2004 Paul Jakma +- Fix with_ipv6 set to 0 build + +* Sat Oct 23 2004 Paul Jakma +- Update to 0.97.2 + +* Sat Oct 23 2004 Andrew J. Schorr +- Make directories be owned by the packages concerned +- Update logrotate scripts to use correct path to killall and use pid files + +* Fri Oct 08 2004 Paul Jakma +- Update to 0.97.0 + +* Wed Sep 15 2004 Paul Jakma +- build snmp support by default +- build irdp support +- build with shared libs +- devel subpackage for archives and headers + +* Thu Jan 08 2004 Paul Jakma +- updated sysconfig files to specify local dir +- added ospf_dump.c crash quick fix patch +- added ospfd persistent interface configuration patch + +* Tue Dec 30 2003 Paul Jakma +- sync to CVS +- integrate RH sysconfig patch to specify daemon options (RH) +- default to have vty listen only to 127.1 (RH) +- add user with fixed UID/GID (RH) +- create user with shell /sbin/nologin rather than /bin/false (RH) +- stop daemons on uninstall (RH) +- delete info file on preun, not postun to avoid deletion on upgrade. (RH) +- isisd added +- cleanup tasks carried out for every daemon + +* Sun Nov 2 2003 Paul Jakma +- Fix -devel package to include all files +- Sync to 0.96.4 + +* Tue Aug 12 2003 Paul Jakma +- Renamed to Quagga +- Sync to Quagga release 0.96 + +* Thu Mar 20 2003 Paul Jakma +- zebra privileges support + +* Tue Mar 18 2003 Paul Jakma +- Fix mem leak in 'show thread cpu' +- Ralph Keller's OSPF-API +- Amir: Fix configure.ac for net-snmp + +* Sat Mar 1 2003 Paul Jakma +- ospfd IOS prefix to interface matching for 'network' statement +- temporary fix for PtP and IPv6 +- sync to zebra.org CVS + +* Mon Jan 20 2003 Paul Jakma +- update to latest cvs +- Yon's "show thread cpu" patch - 17217 +- walk up tree - 17218 +- ospfd NSSA fixes - 16681 +- ospfd nsm fixes - 16824 +- ospfd OLSA fixes and new feature - 16823 +- KAME and ifindex fixes - 16525 +- spec file changes to allow redhat files to be in tree + +* Sat Dec 28 2002 Alexander Hoogerhuis +- Added conditionals for building with(out) IPv6, vtysh, RIP, BGP +- Fixed up some build requirements (patch) +- Added conditional build requirements for vtysh / snmp +- Added conditional to files for _bindir depending on vtysh + +* Mon Nov 11 2002 Paul Jakma +- update to latest CVS +- add Greg Troxel's md5 buffer copy/dup fix +- add RIPv1 fix +- add Frank's multicast flag fix + +* Wed Oct 09 2002 Paul Jakma +- update to latest CVS +- timestamped crypt_seqnum patch +- oi->on_write_q fix + +* Mon Sep 30 2002 Paul Jakma +- update to latest CVS +- add vtysh 'write-config (integrated|daemon)' patch +- always 'make rebuild' in vtysh/ to catch new commands + +* Fri Sep 13 2002 Paul Jakma +- update to 0.93b + +* Wed Sep 11 2002 Paul Jakma +- update to latest CVS +- add "/sbin/ip route flush proto zebra" to zebra RH init on startup + +* Sat Aug 24 2002 Paul Jakma +- update to current CVS +- add OSPF point to multipoint patch +- add OSPF bugfixes +- add BGP hash optimisation patch + +* Fri Jun 14 2002 Paul Jakma +- update to 0.93-pre1 / CVS +- add link state detection support +- add generic PtP and RFC3021 support +- various bug fixes + +* Thu Aug 09 2001 Elliot Lee 0.91a-6 +- Fix bug #51336 + +* Wed Aug 1 2001 Trond Eivind Glomsrød 0.91a-5 +- Use generic initscript strings instead of initscript specific + ( "Starting foo: " -> "Starting $prog:" ) + +* Fri Jul 27 2001 Elliot Lee 0.91a-4 +- Bump the release when rebuilding into the dist. + +* Tue Feb 6 2001 Tim Powers +- built for Powertools + +* Sun Feb 4 2001 Pekka Savola +- Hacked up from PLD Linux 0.90-1, Mandrake 0.90-1mdk and one from zebra.org. +- Update to 0.91a +- Very heavy modifications to init.d/*, .spec, pam, i18n, logrotate, etc. +- Should be quite Red Hat'isque now. diff --git a/build/rpm_specs/zrpc.spec b/build/rpm_specs/zrpc.spec new file mode 100644 index 00000000..a8dd3b75 --- /dev/null +++ b/build/rpm_specs/zrpc.spec @@ -0,0 +1,46 @@ +Name: zrpcd +Version: 0.2 +Release: 0 + +Summary: Zebra Remote Procedure Call +Group: Applications/Internet +License: GPL +Source0: %{name}-%{version}.tar.gz +Source1: zrpcd.service + +BuildRequires: systemd-units + +Requires: thrift zeromq glib2 c-capnproto capnproto quagga +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%description +ZRPC provides a Thrift API and handles RPC to configure Quagga framework. + +%prep +%setup -q + +%build + +%configure + +%install +mkdir -p %{buildroot}%{_unitdir} +install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/zrpcd.service +%make_install + +%post +%systemd_post zrpcd.service + +%preun +%systemd_preun zrpcd.service + +%postun +%systemd_postun_with_restart zrpcd.service + +%files +%defattr(-,root,root) +%{_sbindir}/zrpcd +%{_includedir}/%name/zrpc_global.h +%{_includedir}/%name/zrpc_os_wrapper.h +%{_unitdir}/zrpcd.service diff --git a/build/variables.sh b/build/variables.sh index a40eb234..4793ff86 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -10,8 +10,10 @@ BUILD_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) BUILD_DIR="$(dirname ${BUILD_ROOT})/.build" +QUAGGA_RPMS_DIR=${BUILD_DIR}/quagga_build_dir CACHE_DIR="$(dirname ${BUILD_ROOT})/.cache" CACHE_HISTORY=".cache_history" +PATCHES_DIR="${BUILD_ROOT}/patches" rdo_images_uri=http://buildlogs.centos.org/centos/7/cloud/x86_64/tripleo_images/newton/delorean onos_release_uri=https://downloads.onosproject.org/nightly/ 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" < /dev/null || echo 'WARNING: zrpcd is not running on controller0'" +fi } -- cgit 1.2.3-korg