From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/rpm_specs/zrpc.spec | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 build/rpm_specs/zrpc.spec (limited to 'build/rpm_specs/zrpc.spec') diff --git a/build/rpm_specs/zrpc.spec b/build/rpm_specs/zrpc.spec deleted file mode 100644 index a8dd3b75..00000000 --- a/build/rpm_specs/zrpc.spec +++ /dev/null @@ -1,46 +0,0 @@ -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 -- cgit 1.2.3-korg