From 3a4b4dd343e42fc8cd462fba02e3c89713f6d431 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 13 Aug 2021 08:13:39 +0200 Subject: [PATCH] remove neutron-fwaas/fwaas-dashboard These were retired openstack projects at Ib78ff301076c0295aad9b1bf49eed0f1a7adb7c2 Change-Id: I51b26fce2798876549564bf0b1091961f4a2dcd3 --- .../neutron-fwaas-dashboard.spec.j2 | 114 ------------------ openstack/neutron-fwaas/neutron-fwaas.spec.j2 | 108 ----------------- 2 files changed, 222 deletions(-) delete mode 100644 openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 delete mode 100644 openstack/neutron-fwaas/neutron-fwaas.spec.j2 diff --git a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 b/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 deleted file mode 100644 index 53aac595f..000000000 --- a/openstack/neutron-fwaas-dashboard/neutron-fwaas-dashboard.spec.j2 +++ /dev/null @@ -1,114 +0,0 @@ -{% set pypi_name = 'neutron-fwaas-dashboard' %} -{% set source = fetch_source('https://tarballs.openstack.org/neutron-fwaas-dashboard/neutron-fwaas-dashboard-master.tar.gz') %} -{% set upstream_version = upstream_version() %} -{% set rpm_release = '1' %} - -%if 0%{?rhel} || 0%{?fedora} -%global http_dashboard_dir %{_datarootdir}/openstack-dashboard -%else -%global http_dashboard_dir /srv/www/openstack-dashboard -%endif -Name: {{ py2name() }} -Version: {{ py2rpmversion() }} -Release: {{ py2rpmrelease() }} -Summary: Neutron FWaaS management plugin for Horizon -License: {{ license('Apache-2.0') }} -Group: Development/Languages/Python -URL: https://docs.openstack.org/neutron-fwaas-dashboard -Source0: {{ source|basename }} -BuildRequires: fdupes -BuildRequires: gettext -BuildRequires: {{ py3('horizon') }} -BuildRequires: openstack-macros -BuildRequires: {{ py3('ddt') }} -BuildRequires: {{ py3('django-nose') }} -BuildRequires: {{ py3('mock') }} -BuildRequires: {{ py3('openstackdocstheme') }} -BuildRequires: {{ py3('pbr') }} -BuildRequires: {{ py3('python-subunit') }} -BuildRequires: {{ py3('reno') }} -BuildRequires: {{ py3('testscenarios') }} -BuildRequires: {{ py3('testtools') }} -Requires: {{ py3('horizon-plugin-neutron-fwaas-ui') }} = %{version} -BuildArch: noarch - -%description -OpenStack Neutron FWaaS management plugin for Horizon. - -%package -n {{ py3('horizon-plugin-neutron-fwaas-ui') }} -Summary: Neutron FWaaS Management Plugin for Horizon - Python module -Requires: {{ py3('Django') }} -Requires: {{ py3('python-neutronclient') }} -Requires: {{ py3('pbr') }} - -%description -n {{ py3('horizon-plugin-neutron-fwaas-ui') }} -OpenStack Neutron FWaaS management plugin for Horizon. - -This package contains the core Python module of the neutron-fwaas-ui. - -%package test -Summary: Neutron FWaaS Management Plugin for Horizon - Testsuite -Requires: {{ py3('ddt') }} -Requires: {{ py3('django-nose') }} -Requires: {{ py3('mock') }} -Requires: {{ py3('openstackdocstheme') }} -Requires: {{ py3('python-subunit') }} -Requires: {{ py3('reno') }} -Requires: {{ py3('testscenarios') }} -Requires: {{ py3('testtools') }} - -%description test -OpenStack Neutron FWaaS management plugin for Horizon. -It is used to verify the functionality of the Neutron FWaaS UI Plugin. - -%prep -%autosetup -n {{ pypi_name }}-{{upstream_version}} -%py_req_cleanup - -%build -%{py3_build} -pushd neutron_fwaas_dashboard -PYTHONPATH=%{http_dashboard_dir} python3 ../manage.py compilemessages -popd - -%check -# Depends on Selenium integration tests, we just want unit tests -rm -rf neutron_fwaas_dashboard/test/integration -PYTHONPATH=%{http_dashboard_dir} python3 manage.py test neutron_fwaas_dashboard \ - --settings=neutron_fwaas_dashboard.test.settings \ - --exclude-tag integration - -%install -%{py3_install} - -install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -cp -a neutron_fwaas_dashboard/enabled/_70*.py* %{buildroot}%{http_dashboard_dir}/openstack_dashboard/enabled/ -install -m 0755 -d %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ -cp -a etc/neutron-fwaas-policy.json %{buildroot}%{http_dashboard_dir}/openstack_dashboard/conf/ - -%fdupes %{buildroot}%{python3_sitelib} -%fdupes %{buildroot}%{http_dashboard_dir} - -%post -su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null" - -%postun -su %{apache_user} -s /bin/sh -c "python3 %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null" - -%files -%doc ChangeLog CONTRIBUTING.rst README.rst -%license LICENSE -%{http_dashboard_dir}/openstack_dashboard/enabled/_70*.py* -%{http_dashboard_dir}/openstack_dashboard/conf/neutron-fwaas-policy.json - -%files -n {{ py3('horizon-plugin-neutron-fwaas-ui') }} -%doc README.rst -%license LICENSE -%{python3_sitelib}/neutron_fwaas_dashboard/ -%{python3_sitelib}/neutron_fwaas_dashboard-*.egg-info -%exclude %{python3_sitelib}/neutron_fwaas_dashboard/test* - -%files test -%{python3_sitelib}/neutron_fwaas_dashboard/test* - -%changelog diff --git a/openstack/neutron-fwaas/neutron-fwaas.spec.j2 b/openstack/neutron-fwaas/neutron-fwaas.spec.j2 deleted file mode 100644 index 9d2dfd001..000000000 --- a/openstack/neutron-fwaas/neutron-fwaas.spec.j2 +++ /dev/null @@ -1,108 +0,0 @@ -{% set pypi_name = 'neutron-fwaas' %} -{% set source = fetch_source('https://tarballs.openstack.org/neutron-fwaas/neutron-fwaas-master.tar.gz') %} -{% set upstream_version = upstream_version() %} -{% set rpm_release = '1' %} -Name: {{ py2name() }} -Epoch: {{ epoch('neutron') }} -Version: {{ py2rpmversion() }} -Release: {{ py2rpmrelease() }} -Summary: OpenStack Neutron Firewall Service -License: {{ license('Apache-2.0') }} -Group: Development/Languages/Python -URL: https://docs.openstack.org/neutron -Source0: {{ source|basename }} -BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('neutron') }} -BuildRequires: {{ py3('pbr') }} -Requires: python3-{{ pypi_name }} = %{epoch}:%{version}-%{release} -BuildArch: noarch - -%description -Neutron is a virtual network service for Openstack. -This is a Firewall service plugin for Openstack Neutron (Networking) service. - -%package -n python3-{{ pypi_name }} -Summary: OpenStack Neutron Firewall Service - Python module -Group: Development/Languages/Python -Requires: {{ py2pkg('neutron') }} -Requires: {{ py3('SQLAlchemy') }} -Requires: {{ py3('alembic') }} -Requires: {{ py3('eventlet') }} -Requires: {{ py3('netaddr') }} -Requires: {{ py3('neutron-lib') }} -Requires: {{ py3('os-ken') }} -Requires: {{ py3('oslo.config') }} -Requires: {{ py3('oslo.db') }} -Requires: {{ py3('oslo.log') }} -Requires: {{ py3('oslo.messaging') }} -Requires: {{ py3('oslo.privsep') }} -Requires: {{ py3('oslo.service') }} -Requires: {{ py3('oslo.utils') }} -Requires: {{ py3('pbr') }} -Requires: {{ py3('pyroute2') }} -Requires: {{ py3('pyzmq') }} -Requires: {{ py3('six') }} - -%description -n python3-{{ pypi_name }} -Neutron is a virtual network service for Openstack. -This is a Firewall service plugin for Openstack Neutron (Networking) service. - -This package contains the Neutron Firewall Python library. - -%package doc -Summary: OpenStack Neutron Firewall Service - Documentation -Group: Documentation/HTML -BuildRequires: {{ py3('Sphinx') }} -BuildRequires: {{ py3('openstackdocstheme') }} -BuildRequires: {{ py3('sphinxcontrib-apidoc') }} - -%description doc -Neutron is a virtual network service for Openstack. -This is a Firewall service plugin for Openstack Neutron (Networking) service. - -This package contains the documentation. - -%prep -%autosetup -p1 -n {{ pypi_name }}-{{upstream_version}} -%py_req_cleanup - -%build -%py3_build - -# generate html docs -PYTHONPATH=$PWD PBR_VERSION={{ upstream_version }} %sphinx_build --keep-going -b html doc/source doc/build/html -# remove the Sphinx-build leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} - -%install -%py3_install - -### configuration files -for x in `ls etc/oslo-config-generator/*`; do - PYTHONPATH=. oslo-config-generator --config-file $x -done - -install -p -D -m 644 etc/neutron_fwaas.conf.sample %{buildroot}%{_sysconfdir}/neutron/neutron_fwaas.conf - -# move wrongly installed files from /usr/etc to /etc -install -d -m 755 %{buildroot}%{_datarootdir}/neutron/rootwrap -mv %{buildroot}/%{_prefix}/%{_sysconfdir}/neutron/rootwrap.d/* %{buildroot}%{_datarootdir}/neutron/rootwrap - -%files -%license LICENSE -%doc README.rst -%config(noreplace) %{_sysconfdir}/neutron/neutron_fwaas.conf -%dir %{_datarootdir}/neutron/rootwrap -%{_datarootdir}/neutron/rootwrap/fwaas-privsep.filters -%{_bindir}/neutron-fwaas-migrate-v1-to-v2 - -%files -n python3-{{ pypi_name }} -%license LICENSE -%{python3_sitelib}/neutron_fwaas -%{python3_sitelib}/neutron_fwaas-*.egg-info - -%files doc -%license LICENSE -%doc doc/build/html - -%changelog