summaryrefslogtreecommitdiffstats
path: root/build/rpm_specs
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-05-02 12:34:38 -0400
committerTim Rozet <trozet@redhat.com>2018-05-21 10:36:05 -0400
commitd2913d4bcc0fcd25dc3d01f6604049dfd0a9217d (patch)
tree5cf7a0d04cbf8b30488bb18ba7ee79e215f08e47 /build/rpm_specs
parent22bc385f5b2e25694699a614268aaad2fdacbb12 (diff)
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 <trozet@redhat.com>
Diffstat (limited to 'build/rpm_specs')
-rw-r--r--build/rpm_specs/c_capnproto.spec45
-rw-r--r--build/rpm_specs/networking-vpp.spec1
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec209
-rw-r--r--build/rpm_specs/opnfv-apex-onos.spec44
-rw-r--r--build/rpm_specs/opnfv-apex-release.spec36
-rw-r--r--build/rpm_specs/opnfv-apex-undercloud.spec53
-rw-r--r--build/rpm_specs/opnfv-apex.spec224
-rw-r--r--build/rpm_specs/quagga.spec744
-rw-r--r--build/rpm_specs/zrpc.spec46
9 files changed, 177 insertions, 1225 deletions
diff --git a/build/rpm_specs/c_capnproto.spec b/build/rpm_specs/c_capnproto.spec
deleted file mode 100644
index 2d95494..0000000
--- a/build/rpm_specs/c_capnproto.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-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 <trozet@redhat.com> - 1.0-1
-- Initial version
diff --git a/build/rpm_specs/networking-vpp.spec b/build/rpm_specs/networking-vpp.spec
index 4c84f20..9fb66ad 100644
--- a/build/rpm_specs/networking-vpp.spec
+++ b/build/rpm_specs/networking-vpp.spec
@@ -55,3 +55,4 @@ rm -rf %{buildroot}
%files -f INSTALLED_FILES
%defattr(-,root,root)
%attr(644,root,root) %{_unitdir}/neutron-vpp-agent.service
+
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
deleted file mode 100644
index 0d12e8d..0000000
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ /dev/null
@@ -1,209 +0,0 @@
-%global srcname opnfv-apex
-
-Name: python34-%{srcname}
-Version: 6.0
-Release: %{_release}
-Summary: Scripts for OPNFV deployment using Apex
-
-Group: System Environment
-License: Apache 2.0
-URL: https://gerrit.opnfv.org/gerrit/apex.git
-Source0: opnfv-apex-common.tar.gz
-
-BuildArch: noarch
-BuildRequires: python34-docutils python34-devel
-Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools python34-libvirt
-Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python34-virtualbmc
-Requires: ipxe-roms-qemu >= 20160127-1
-Requires: libvirt-devel ansible
-Requires: python34-iptables python34-cryptography python34-pbr
-Requires: python34-GitPython python34-pygerrit2 python34-distro
-
-%description
-Scripts for OPNFV deployment using Apex
-https://wiki.opnfv.org/apex
-
-%prep
-%autosetup -n %{srcname}-%{version}
-
-%build
-rst2html docs/release/installation/index.rst docs/release/installation/installation-instructions.html
-rst2html docs/release/release-notes/release-notes.rst docs/release/release-notes/release-notes.html
-%py3_build
-
-%global __python %{__python3}
-
-%install
-mkdir -p %{buildroot}%{_bindir}/
-%py3_install
-install ci/util.sh %{buildroot}%{_bindir}/opnfv-util
-
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install build/bash_completion_apex %{buildroot}%{_sysconfdir}/bash_completion.d/apex
-
-mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/
-cp -f %{buildroot}%{_datadir}/opnfv-apex/config/deploy/* %{buildroot}%{_sysconfdir}/opnfv-apex/
-cp -f %{buildroot}%{_datadir}/opnfv-apex/config/network/* %{buildroot}%{_sysconfdir}/opnfv-apex/
-rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-csit-noha.yaml
-rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml
-
-mkdir -p %{buildroot}%{_docdir}/opnfv/
-install LICENSE.rst %{buildroot}%{_docdir}/opnfv/
-install docs/release/installation/installation-instructions.html %{buildroot}%{_docdir}/opnfv/
-install docs/release/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst
-install docs/release/release-notes/release-notes.html %{buildroot}%{_docdir}/opnfv/
-install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example
-install config/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example
-install config/network/network_settings_v6.yaml %{buildroot}%{_docdir}/opnfv/network_settings_v6.yaml.example
-install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example
-
-%files
-%{python3_sitelib}/apex/
-%{python3_sitelib}/apex-*.egg-info
-%defattr(644, root, root, 644)
-%attr(755,root,root) %{_bindir}/opnfv-deploy
-%attr(755,root,root) %{_bindir}/opnfv-clean
-%attr(755,root,root) %{_bindir}/opnfv-util
-%attr(755,root,root) %{_bindir}/opnfv-pyutil
-%{_datadir}/opnfv-apex/
-%{_sysconfdir}/bash_completion.d/apex
-%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-pike_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-queens_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-master_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-pike_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-queens_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-master_upstream-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sfc-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-l2gw-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-l2gw-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sriov-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sriov-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/network_settings.yaml
-%{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml
-%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml
-%doc %{_docdir}/opnfv/LICENSE.rst
-%doc %{_docdir}/opnfv/installation-instructions.html
-%doc %{_docdir}/opnfv/release-notes.rst
-%doc %{_docdir}/opnfv/release-notes.html
-%doc %{_docdir}/opnfv/deploy_settings.yaml.example
-%doc %{_docdir}/opnfv/network_settings.yaml.example
-%doc %{_docdir}/opnfv/network_settings_v6.yaml.example
-%doc %{_docdir}/opnfv/inventory.yaml.example
-
-%changelog
-* Tue Apr 17 2018 Feng Pan <fpan@redhat.com> - 6.0-4
- Removes network_settings_vpp.yaml
-* Tue Apr 03 2018 Tim Rozet <trozet@redhat.com> - 6.0-3
- Adds fetch logs
-* Fri Mar 09 2018 Tim Rozet <trozet@redhat.com> - 6.0-2
- Add upstream deploy files with containers
-* Wed Feb 14 2018 Tim Rozet <trozet@redhat.com> - 6.0-1
- Fix docutils requirement and add python34-distro
-* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
- Bump version for Fraser
-* Wed Oct 25 2017 Tim Rozet <trozet@redhat.com> - 5.0-9
-- Adds GitPython and pygerrit2 dependencies
-* Mon Oct 2 2017 Tim Rozet <trozet@redhat.com> - 5.0-8
-- Adds upstream deployment scenario
-* Wed Sep 20 2017 Tim Rozet <trozet@redhat.com> - 5.0-7
-- Add calipso
-* Fri Sep 08 2017 Tim Rozet <trozet@redhat.com> - 5.0-6
-- Updates clean to use python
-* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5
-- Updated requirements
-* Mon Aug 14 2017 Tim Rozet <trozet@redhat.com> - 5.0-4
-- Updated for python refactoring
-* Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-3
-- adding configure-vm
-* Tue Apr 11 2017 Dan Radez <dradez@redhat.com> - 5.0-2
-- Remove l2 scenario files
-* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
-- Version update for Euphrates
-- rename to ovs_dpdk
-* Wed Mar 29 2017 Dan Radez <dradez@redhat.com> - 4.0-9
-- Remove odl_l2-nofeature scenario file
-- rename all odl_l3 scenario files to odl
-* Thu Mar 23 2017 Tim Rozet <trozet@redhat.com> - 4.0-8
-- Adds os-odl_l3-ovs-ha and noha scenarios
-* Sun Mar 12 2017 Feng Pan <fpan@redhat.com> - 4.0-7
-- Add os-nosdn-fdio-ha.yaml
-* Fri Mar 10 2017 Feng Pan <fpan@redhat.com> - 4.0-6
-- Add os-odl_l3-fdio-noha.yaml and os-odl_l3-fdio-ha.yaml
-* Wed Mar 08 2017 Dan Radez <dradez@redhat.com> - 4.0-5
-- Adding kvm4nfv files
-- Adding OVN files
-* Tue Feb 14 2017 Feng Pan <fpan@redhat.com> - 4.0-4
-- Add network_settings_vpp.yaml
-* Fri Feb 3 2017 Nikolas Hermanns <nikolas.hermanns@ericsson.com> - 4.0-3
-- change odl_l3-gluon-noha to odl-gluon-noha
-* Thu Feb 2 2017 Feng Pan <fpan@redhat.com> - 4.0-2
-- Add odl_l3-gluon-noha config file
-* Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
-- Version update for Danube
-* Fri Sep 16 2016 Dan Radez <dradez@redhat.com> - 3.0-13
-- adding bash completion script
-* Tue Aug 30 2016 Tim Rozet <trozet@redhat.com> - 3.0-12
-- Add clean library.
-* Mon Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
-- Add nosdn fdio scenarios.
-* Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10
-- Adding functions.sh files
-* Wed Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
-- Add fdio scenarios.
-* Tue Jun 14 2016 Feng Pan <fpan@redhat.com> - 3.0-8
-- Add network_settings_v6.yaml
-* Thu Jun 2 2016 Michael Chapman <michapma@redhat.com> - 3.0-7
-- Add custom libvirt domain.xml.
-* Wed Jun 1 2016 Feng Pan <fpan@redhat.com> - 3.0-6
-- Add performance deployment file
-* Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
-- Fixes python3 dependency.
-* Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4
-- Adds dependency for python34-setuptools
-* Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3
-- Adds python network setting parsing lib.
-* Fri Apr 15 2016 Feng Pan <fpan@redhat.com> - 3.0-2
-- Adds python ip utility lib.
-* Mon Apr 11 2016 Tim Rozet <trozet@redhat.com> - 3.0-1
-- adding opnfv-util
-* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
-- Version update for Colorado
-* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 2.2-0
-- adding dependencies initscripts net-tools iputils iproute iptables
-* Wed Jan 27 2016 Tim Rozet <trozet@redhat.com> - 2.1-4
-- Adds example inventory file and nosdn scenario
-* Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-3
-- Updating the installation instructions
-* Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-2
-- Package Split
diff --git a/build/rpm_specs/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec
deleted file mode 100644
index 2d600b9..0000000
--- a/build/rpm_specs/opnfv-apex-onos.spec
+++ /dev/null
@@ -1,44 +0,0 @@
-Name: opnfv-apex-onos
-Version: 6.0
-Release: %{_release}
-Summary: Overcloud Disk images for OPNFV Apex ONOS deployment
-
-Group: System Environment
-License: Apache 2.0
-URL: https://gerrit.opnfv.org/gerrit/apex.git
-Source0: opnfv-apex-onos.tar.gz
-
-Provides: opnfv-apex-sdn
-BuildArch: noarch
-Requires: opnfv-apex-common opnfv-apex-undercloud
-
-%description
-Overcloud Disk images for OPNFV Apex ONOS deployment
-https://wiki.opnfv.org/apex
-
-%prep
-%setup -q
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_var}/opt/opnfv/images/
-install build/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
-
-%files
-%defattr(644, root, root, -)
-%{_var}/opt/opnfv/images/overcloud-full-onos.qcow2
-
-%changelog
-* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
- Bump version for Fraser
-* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
-- Version update for Euphrates
-* Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2
-- Make install path consistent
-* Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
-- Version update for Danube
-* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
-- Version update for Colorado
-* Mon Mar 07 2016 Dan Radez <dradez@redhat.com> - 2.1-1
-- Initial Packaging
diff --git a/build/rpm_specs/opnfv-apex-release.spec b/build/rpm_specs/opnfv-apex-release.spec
deleted file mode 100644
index 9660b83..0000000
--- a/build/rpm_specs/opnfv-apex-release.spec
+++ /dev/null
@@ -1,36 +0,0 @@
-Name: opnfv-apex-release
-Version: fraser
-Release: %{_release}
-Summary: RPM Release file
-
-Group: System Environment
-License: Apache 2.0
-URL: https://gerrit.opnfv.org/gerrit/apex.git
-Source0: opnfv-apex-release.tar.gz
-
-BuildArch: noarch
-Requires: rdo-release = pike epel-release libvirt-python
-
-%description
-RPM Release file that provides a yum repo file to install OPNFV Apex
-
-%prep
-%setup -q
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_sysconfdir}/yum.repos.d/
-install config/yum.repos.d/opnfv-apex.repo %{buildroot}%{_sysconfdir}/yum.repos.d/
-
-%files
-%defattr(644, root, root, -)
-%{_sysconfdir}/yum.repos.d/opnfv-apex.repo
-
-%changelog
-* Mon Nov 13 2017 Tim Rozet <trozet@redhat.com> - 6.0-1
-- Version update for Fraser
-* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
-- Version update for Euphrates
-* Wed Nov 23 2016 Dan Radez <dradez@redhat.com> - 3.0-1
-- Initial Packaging
diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec
deleted file mode 100644
index fc3c3ec..0000000
--- a/build/rpm_specs/opnfv-apex-undercloud.spec
+++ /dev/null
@@ -1,53 +0,0 @@
-Name: opnfv-apex-undercloud
-Version: 6.0
-Release: %{_release}
-Summary: Scripts and Disk images to launch the Undercloud for OPNFV Apex
-
-Group: System Environment
-License: Apache 2.0
-URL: https://gerrit.opnfv.org/gerrit/apex.git
-Source0: opnfv-apex-undercloud.tar.gz
-
-BuildArch: noarch
-BuildRequires: python-docutils
-Requires: openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools
-
-%description
-Scripts and Disk images to launch the Undercloud for OPNFV Apex
-https://wiki.opnfv.org/apex
-
-%prep
-%setup -q
-
-%build
-
-%install
-mkdir -p %{buildroot}%{_var}/opt/opnfv/images/
-mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/
-
-install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
-install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/
-install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/
-
-%files
-%defattr(644, root, root, -)
-%{_var}/opt/opnfv/images/undercloud.qcow2
-%{_var}/opt/opnfv/network-environment.yaml
-%{_var}/opt/opnfv/nics-template.yaml.jinja2
-
-
-%changelog
-* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
- Bump version for Fraser
-* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
-- Version update for Euphrates
-* Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
-- Version update for Danube
-* Tue May 24 2016 Tim Rozet <trozet@redhat.com> - 3.0-1
-- Adds jinja2 nic templates
-* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
-- Version update for Colorado
-* Wed Mar 30 2016 Dan Radez <dradez@redhat.com> - 2.1-2
-- Replacing NIC files with templates
-* Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-1
-- Package Split
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index 18fafa6..fafc82f 100644
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -1,79 +1,207 @@
-Name: opnfv-apex
-Version: 6.0
+%global srcname opnfv-apex
+
+Name: python34-%{srcname}
+Version: 7.0
Release: %{_release}
-Summary: Overcloud Disk images for OPNFV Apex OpenDaylight deployment
+Summary: Scripts for OPNFV deployment using Apex
Group: System Environment
License: Apache 2.0
URL: https://gerrit.opnfv.org/gerrit/apex.git
Source0: opnfv-apex.tar.gz
-Provides: opnfv-apex-sdn
-BuildArch: noarch
-Requires: python34-opnfv-apex opnfv-apex-undercloud
+BuildArch: noarch
+BuildRequires: python34-docutils python34-devel
+Requires: openvswitch qemu-kvm bridge-utils libguestfs-tools python34-libvirt
+Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python34-virtualbmc
+Requires: ipxe-roms-qemu >= 20160127-1
+Requires: libvirt-devel ansible
+Requires: python34-iptables python34-cryptography python34-pbr
+Requires: python34-GitPython python34-pygerrit2 python34-distro
%description
-Overcloud Disk images for OPNFV Apex OpenDaylight deployment
+Scripts for OPNFV deployment using Apex
https://wiki.opnfv.org/apex
%prep
-%setup -q
+%autosetup -n %{srcname}-%{version}
%build
+rst2html docs/release/installation/index.rst docs/release/installation/installation-instructions.html
+rst2html docs/release/release-notes/release-notes.rst docs/release/release-notes/release-notes.html
+%py3_build
+
+%global __python %{__python3}
%install
-mkdir -p %{buildroot}%{_var}/opt/opnfv/images/
-install build/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/images/
-install build/overcloud-full.vmlinuz %{buildroot}%{_var}/opt/opnfv/images/
-install build/overcloud-full.initrd %{buildroot}%{_var}/opt/opnfv/images/
+mkdir -p %{buildroot}%{_bindir}/
+%py3_install
+install ci/util.sh %{buildroot}%{_bindir}/opnfv-util
+
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
+install build/bash_completion_apex %{buildroot}%{_sysconfdir}/bash_completion.d/apex
+
+mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/
+cp -f %{buildroot}%{_datadir}/opnfv-apex/config/deploy/* %{buildroot}%{_sysconfdir}/opnfv-apex/
+cp -f %{buildroot}%{_datadir}/opnfv-apex/config/network/* %{buildroot}%{_sysconfdir}/opnfv-apex/
+rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-csit-noha.yaml
+rm -f %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml
+
+mkdir -p %{buildroot}%{_docdir}/opnfv/
+install LICENSE.rst %{buildroot}%{_docdir}/opnfv/
+install docs/release/installation/installation-instructions.html %{buildroot}%{_docdir}/opnfv/
+install docs/release/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst
+install docs/release/release-notes/release-notes.html %{buildroot}%{_docdir}/opnfv/
+install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example
+install config/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example
+install config/network/network_settings_v6.yaml %{buildroot}%{_docdir}/opnfv/network_settings_v6.yaml.example
+install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example
%files
-%defattr(644, root, root, -)
-%{_var}/opt/opnfv/images/overcloud-full-opendaylight.qcow2
-%{_var}/opt/opnfv/images/overcloud-full.vmlinuz
-%{_var}/opt/opnfv/images/overcloud-full.initrd
+%{python3_sitelib}/apex/
+%{python3_sitelib}/apex-*.egg-info
+%defattr(644, root, root, 644)
+%attr(755,root,root) %{_bindir}/opnfv-deploy
+%attr(755,root,root) %{_bindir}/opnfv-clean
+%attr(755,root,root) %{_bindir}/opnfv-util
+%attr(755,root,root) %{_bindir}/opnfv-pyutil
+%{_datadir}/opnfv-apex/
+%{_sysconfdir}/bash_completion.d/apex
+%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-queens-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-queens-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-sfc-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-fdio_dvr-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-l2gw-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-l2gw-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-sriov-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-sriov-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
+%{_sysconfdir}/opnfv-apex/network_settings.yaml
+%{_sysconfdir}/opnfv-apex/network_settings_vlans.yaml
+%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml
+%doc %{_docdir}/opnfv/LICENSE.rst
+%doc %{_docdir}/opnfv/installation-instructions.html
+%doc %{_docdir}/opnfv/release-notes.rst
+%doc %{_docdir}/opnfv/release-notes.html
+%doc %{_docdir}/opnfv/deploy_settings.yaml.example
+%doc %{_docdir}/opnfv/network_settings.yaml.example
+%doc %{_docdir}/opnfv/network_settings_v6.yaml.example
+%doc %{_docdir}/opnfv/inventory.yaml.example
%changelog
+* Wed May 02 2018 Tim Rozet <trozet@redhat.com> - 7.0-0
+ Updates master with new version and deploy settings
+* Tue Apr 17 2018 Feng Pan <fpan@redhat.com> - 6.0-4
+ Removes network_settings_vpp.yaml
+* Tue Apr 03 2018 Tim Rozet <trozet@redhat.com> - 6.0-3
+ Adds fetch logs
+* Fri Mar 09 2018 Tim Rozet <trozet@redhat.com> - 6.0-2
+ Add upstream deploy files with containers
+* Wed Feb 14 2018 Tim Rozet <trozet@redhat.com> - 6.0-1
+ Fix docutils requirement and add python34-distro
* Wed Nov 29 2017 Tim Rozet <trozet@redhat.com> - 6.0-0
Bump version for Fraser
-* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-3
+* Wed Oct 25 2017 Tim Rozet <trozet@redhat.com> - 5.0-9
+- Adds GitPython and pygerrit2 dependencies
+* Mon Oct 2 2017 Tim Rozet <trozet@redhat.com> - 5.0-8
+- Adds upstream deployment scenario
+* Wed Sep 20 2017 Tim Rozet <trozet@redhat.com> - 5.0-7
+- Add calipso
+* Fri Sep 08 2017 Tim Rozet <trozet@redhat.com> - 5.0-6
+- Updates clean to use python
+* Wed Aug 23 2017 Tim Rozet <trozet@redhat.com> - 5.0-5
- Updated requirements
-* Fri May 26 2017 Tim Rozet <trozet@redhat.com> - 5.0-2
-- Fixes missing ramdisk and kernel
+* Mon Aug 14 2017 Tim Rozet <trozet@redhat.com> - 5.0-4
+- Updated for python refactoring
+* Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-3
+- adding configure-vm
+* Tue Apr 11 2017 Dan Radez <dradez@redhat.com> - 5.0-2
+- Remove l2 scenario files
* Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
- Version update for Euphrates
-* Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2
-- Make install path consistent
+- rename to ovs_dpdk
+* Wed Mar 29 2017 Dan Radez <dradez@redhat.com> - 4.0-9
+- Remove odl_l2-nofeature scenario file
+- rename all odl_l3 scenario files to odl
+* Thu Mar 23 2017 Tim Rozet <trozet@redhat.com> - 4.0-8
+- Adds os-odl_l3-ovs-ha and noha scenarios
+* Sun Mar 12 2017 Feng Pan <fpan@redhat.com> - 4.0-7
+- Add os-nosdn-fdio-ha.yaml
+* Fri Mar 10 2017 Feng Pan <fpan@redhat.com> - 4.0-6
+- Add os-odl_l3-fdio-noha.yaml and os-odl_l3-fdio-ha.yaml
+* Wed Mar 08 2017 Dan Radez <dradez@redhat.com> - 4.0-5
+- Adding kvm4nfv files
+- Adding OVN files
+* Tue Feb 14 2017 Feng Pan <fpan@redhat.com> - 4.0-4
+- Add network_settings_vpp.yaml
+* Fri Feb 3 2017 Nikolas Hermanns <nikolas.hermanns@ericsson.com> - 4.0-3
+- change odl_l3-gluon-noha to odl-gluon-noha
+* Thu Feb 2 2017 Feng Pan <fpan@redhat.com> - 4.0-2
+- Add odl_l3-gluon-noha config file
* Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
- Version update for Danube
+* Fri Sep 16 2016 Dan Radez <dradez@redhat.com> - 3.0-13
+- adding bash completion script
+* Tue Aug 30 2016 Tim Rozet <trozet@redhat.com> - 3.0-12
+- Add clean library.
+* Mon Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
+- Add nosdn fdio scenarios.
+* Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10
+- Adding functions.sh files
+* Wed Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
+- Add fdio scenarios.
+* Tue Jun 14 2016 Feng Pan <fpan@redhat.com> - 3.0-8
+- Add network_settings_v6.yaml
+* Thu Jun 2 2016 Michael Chapman <michapma@redhat.com> - 3.0-7
+- Add custom libvirt domain.xml.
+* Wed Jun 1 2016 Feng Pan <fpan@redhat.com> - 3.0-6
+- Add performance deployment file
+* Sun May 15 2016 Feng Pan <fpan@redhat.com> - 3.0-5
+- Fixes python3 dependency.
+* Sun May 8 2016 Feng Pan <fpan@redhat.com> - 3.0-4
+- Adds dependency for python34-setuptools
+* Fri Apr 22 2016 Feng Pan <fpan@redhat.com> - 3.0-3
+- Adds python network setting parsing lib.
+* Fri Apr 15 2016 Feng Pan <fpan@redhat.com> - 3.0-2
+- Adds python ip utility lib.
+* Mon Apr 11 2016 Tim Rozet <trozet@redhat.com> - 3.0-1
+- adding opnfv-util
* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0
- Version update for Colorado
-* Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-4
-- cleaning out libvirt config files
-- replacing instack-virt-setup with direct tripleo calls
-* Tue Jan 19 2016 Dan Radez <dradez@redhat.com> - 2.1-3
-- Remove conflicts with other SDN controllers, they can co-exist now
-- update overcloud image name to specify opendaylight
+* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 2.2-0
+- adding dependencies initscripts net-tools iputils iproute iptables
+* Wed Jan 27 2016 Tim Rozet <trozet@redhat.com> - 2.1-4
+- Adds example inventory file and nosdn scenario
+* Wed Jan 20 2016 Dan Radez <dradez@redhat.com> - 2.1-3
+- Updating the installation instructions
* Thu Jan 14 2016 Dan Radez <dradez@redhat.com> - 2.1-2
- Package Split
-* Wed Jan 13 2016 Dan Radez <dradez@redhat.com> - 2.1-1
-- Incrementing Minor for Bramaputra RC release
-* Sun Dec 20 2015 Tim Rozet <trozet@redhat.com> - 2.0-8
-- Modifies networks to include OPNFV private/storage networks
-* Tue Dec 15 2015 Dan Radez <dradez@redhat.com> - 2.0-7
-- Added deploy settings for flat network config
-- cleaned up files that don't need to be in the rpm
-* Wed Dec 09 2015 Dan Radez <dradez@redhat.com> - 2.0-6
-- Updating the OpenDaylight Patch
-* Sat Dec 05 2015 Dan Radez <dradez@redhat.com> - 2.0-5
-- Removing glance images
-* Fri Nov 20 2015 Dan Radez <dradez@redhat.com> - 2.0-4
-- Adding documentation
-* Thu Nov 12 2015 Dan Radez <dradez@redhat.com> - 2.0-3
-- OpenDaylight and Network Isolation support
-* Wed Oct 21 2015 Dan Radez <dradez@redhat.com> - 2.0-2
-- Initial deployment success using RPM packaging
-* Fri Sep 25 2015 Dan Radez <dradez@redhat.com> - 2.0-1
-- Migrated to RDO Manager
-* Fri Apr 24 2015 Dan Radez <dradez@redhat.com> - 0.1-1
-- Initial Packaging
diff --git a/build/rpm_specs/quagga.spec b/build/rpm_specs/quagga.spec
deleted file mode 100644
index 9a85e9d..0000000
--- a/build/rpm_specs/quagga.spec
+++ /dev/null
@@ -1,744 +0,0 @@
-# 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: %%global 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: %global quagga_uid 92 }
-%{!?quagga_gid: %global quagga_gid 92 }
-%{!?vty_gid: %global 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: %global 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
-texi2html --number-footnotes --number-sections quagga.texi
-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 <service name> <port/proto> <comment>
-# 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 <paul@jakma.org>
-- 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 <mwinter@opensourcerouting.org>
-- 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 <paul@jakma.org>
-- buildreq updates
-- add a default define for with_pimd
-
-* Mon Sep 12 2005 Paul Jakma <paul@dishone.st>
-- 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 <ajschorr@alumni.princeton.edu>
-- on package upgrade, implement careful, phased restart logic
-- use gcc -rdynamic flag when linking for better backtraces
-
-* Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
-- daemonv6_list should contain only IPv6 daemons
-
-* Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
-- watchquagga added
-- on upgrade, all daemons should be condrestart'ed
-- on removal, all daemons should be stopped
-
-* Mon Nov 08 2004 Paul Jakma <paul@dishone.st>
-- Use makeinfo --html to generate quagga.html
-
-* Sun Nov 07 2004 Paul Jakma <paul@dishone.st>
-- Fix with_ipv6 set to 0 build
-
-* Sat Oct 23 2004 Paul Jakma <paul@dishone.st>
-- Update to 0.97.2
-
-* Sat Oct 23 2004 Andrew J. Schorr <aschorr@telemetry-investments.com>
-- 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 <paul@dishone.st>
-- Update to 0.97.0
-
-* Wed Sep 15 2004 Paul Jakma <paul@dishone.st>
-- build snmp support by default
-- build irdp support
-- build with shared libs
-- devel subpackage for archives and headers
-
-* Thu Jan 08 2004 Paul Jakma <paul@dishone.st>
-- 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 <paul@dishone.st>
-- 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 <paul@dishone.st>
-- Fix -devel package to include all files
-- Sync to 0.96.4
-
-* Tue Aug 12 2003 Paul Jakma <paul@dishone.st>
-- Renamed to Quagga
-- Sync to Quagga release 0.96
-
-* Thu Mar 20 2003 Paul Jakma <paul@dishone.st>
-- zebra privileges support
-
-* Tue Mar 18 2003 Paul Jakma <paul@dishone.st>
-- 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 <paul@dishone.st>
-- 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 <paul@dishone.st>
-- 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 <alexh@ihatent.com>
-- 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 <paulj@alphyra.ie>
-- 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 <paulj@alphyra.ie>
-- update to latest CVS
-- timestamped crypt_seqnum patch
-- oi->on_write_q fix
-
-* Mon Sep 30 2002 Paul Jakma <paulj@alphyra.ie>
-- 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 <paulj@alphyra.ie>
-- update to 0.93b
-
-* Wed Sep 11 2002 Paul Jakma <paulj@alphyra.ie>
-- update to latest CVS
-- add "/sbin/ip route flush proto zebra" to zebra RH init on startup
-
-* Sat Aug 24 2002 Paul Jakma <paulj@alphyra.ie>
-- update to current CVS
-- add OSPF point to multipoint patch
-- add OSPF bugfixes
-- add BGP hash optimisation patch
-
-* Fri Jun 14 2002 Paul Jakma <paulj@alphyra.ie>
-- 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 <sopwith@redhat.com> 0.91a-6
-- Fix bug #51336
-
-* Wed Aug 1 2001 Trond Eivind Glomsrød <teg@redhat.com> 0.91a-5
-- Use generic initscript strings instead of initscript specific
- ( "Starting foo: " -> "Starting $prog:" )
-
-* Fri Jul 27 2001 Elliot Lee <sopwith@redhat.com> 0.91a-4
-- Bump the release when rebuilding into the dist.
-
-* Tue Feb 6 2001 Tim Powers <timp@redhat.com>
-- built for Powertools
-
-* Sun Feb 4 2001 Pekka Savola <pekkas@netcore.fi>
-- 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
deleted file mode 100644
index a8dd3b7..0000000
--- 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