openstack
/
rpm-packaging
Code Issues Proposed changes

Drop vmware nsx related packages 

Change-Id: Ibf849c28356619a2a02cd7fab3bf0cbd56b1f7ca
This commit is contained in:
Dirk Müller 2024-01-07 21:41:04 +01:00
parent faa511fe7a
commit 4598a587f5
No known key found for this signature in database
8 changed files with 0 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
openstack/networking-vsphere/0001-Switch-documentation-build-to-python3.patch
View File

@ -1,95 +0,0 @@
From f889b11c8dcea898dd3a0a7b55ba5b74600a53af Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 16 Jul 2019 23:00:46 +0200
Subject: [PATCH] Switch documentation build to python3
oslosphinx is not compatible with python 3/sphinx2, so we need
to either switch to openstackdocstheme or remove oslosphinx.
Also switch tox environments to use python 3 by default including
docs and switch to sphinx-build.
Change-Id: I76b9417d77241a9e8d8ac3c9bdaf4ebddae1e0ab
---
doc/source/conf.py | 1 -
test-requirements.txt | 1 -
tox.ini | 11 +++++------
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f0b0465..a2213a6 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,7 +23,6 @@ sys.path.insert(0, os.path.abspath('../..'))
extensions = [
'sphinx.ext.autodoc',
#'sphinx.ext.intersphinx',
- 'oslosphinx'
]
# autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/test-requirements.txt b/test-requirements.txt
index 34a038c..8aef4cf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,6 @@ mock>=2.0.0 # BSD
coverage!=4.4,>=4.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
-oslosphinx>=4.7.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 1844d70..28f91d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ minversion = 1.6
skipsdist = True
[testenv]
+basepython = python3
setenv = VIRTUAL_ENV={envdir}
passenv = TRACE_FAILONLY
usedevelop = True
@@ -17,7 +18,6 @@ commands = stestr run {posargs}
# mode. To do this define the TRACE_FAILONLY environmental variable.
[testenv:scenario]
-basepython = python3
setenv = OS_TEST_PATH=./networking_vsphere/tests/scenario
passenv = {[testenv]passenv} TEMPEST_CONFIG_DIR
# If you are running the tests locally you should set the env variable
@@ -25,18 +25,18 @@ passenv = {[testenv]passenv} TEMPEST_CONFIG_DIR
[testenv:pep8]
commands = flake8
+### NOTE(dmllr): Remove after upgrading at a recent hacking/flake8
+basepython = python2
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:cover]
-basepython = python3
commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:docs]
-basepython = python3
-commands = python setup.py build_sphinx
+commands =
+ sphinx-build -W -b html doc/source doc/build/html
[flake8]
# E123 closing bracket does not match indentation of opening bracket's line
@@ -59,7 +59,6 @@ import_exceptions = networking_vsphere._i18n
local-check-factory = neutron_lib.hacking.checks.factory
[testenv:lower-constraints]
-basepython = python3
setenv = OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:60}
deps = -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/requirements.txt
--
2.22.0

197
openstack/networking-vsphere/networking-vsphere.spec.j2
View File

@ -1,197 +0,0 @@
{% set pypi_name = 'networking-vsphere' %}
{% set source = fetch_source('https://tarballs.openstack.org/networking-vsphere/networking-vsphere-master.tar.gz') %}
{% set upstream_version = upstream_version() %}
{% set rpm_release = '1' %}
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: OVSvApp and DVS VMware vSphere drivers for Neutron
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://docs.openstack.org/{{ pypi_name }}
Source0: {{ source|basename }}
Source1: openstack-neutron-dvs-agent.service
Source2: openstack-neutron-ovsvapp-agent.service
Source3: openstack-neutron-ovsvapp-agent-monitor.service
# https://review.opendev.org/#/c/671155/
Patch1: 0001-Switch-documentation-build-to-python3.patch
BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: {{ py3('Babel') }}
BuildRequires: {{ py3('devel') }}
BuildRequires: {{ py3('kombu') }}
BuildRequires: {{ py3('mock') }}
BuildRequires: python3-nova
BuildRequires: {{ py3('oslo.vmware') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('ovsdbapp') }}
BuildRequires: {{ py3('pbr') }}
BuildRequires: {{ py3('testrepository') }}
BuildRequires: {{ py3('testresources') }}
BuildRequires: {{ py3('testscenarios') }}
BuildRequires: {{ py3('testtools') }}
Requires: python3-{{ pypi_name }} = %{version}-%{release}
BuildArch: noarch
%if 0%{?suse_version}
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%else
BuildRequires: systemd
Requires(post): systemd
Requires(postun): systemd
Requires(preun): systemd
%endif
%description
Neutron ML2 drivers and L2 agents for OVSvApp - a Neutron supported
solution for vSphere deployments in the form of a service VM called
OVSvApp VM which steers the ESX tenant VMs' traffic through it.
%package -n python3-{{ pypi_name }}
Summary: OVSvApp and DVS Drivers - Python libraries
Requires: {{ py3('Babel') }}
# NOTE(dmllr): Todo, need to unwind recursive dependencies
#Requires: python3-neutron
Requires: python3-nova
Requires: {{ py3('oslo.vmware') }}
Requires: {{ py3('ovsdbapp') }}
%description -n python3-{{ pypi_name }}
The OVSvApp solution comprises of a service VM called OVSvApp VM hosted on each
ESXi hypervisor within a cluster and two vSphere Distributed Switches (VDS).
Two ML2 mechanism drivers are provided for Neutron - one for OVSvApp and
another one for DVS.
This package contains the Python libraries.
%package dvs-agent
Summary: DVS L2 agent for %{name} plugin
Group: System/Management
Requires: %{name} = %{version}-%{release}
%description dvs-agent
Contains the DVS L2 agent service for %{name}
%package ovsvapp-agent
Summary: OVSvApp agents for %{name} plugin
Group: System/Management
Requires: %{name} = %{version}-%{release}
Requires: openvswitch
%description ovsvapp-agent
Contains the OVSvApp agent services for %{name}
%package doc
Summary: Documentation for %{name}
Group: Documentation/HTML
BuildRequires: {{ py3('Sphinx') }}
%description doc
This package contains extra documentation for %{name}.
%package test
Summary: Testsuite for the OVSvApp VMware
Group: System/Management
Requires: %{name} = %{version}-%{release}
Requires: {{ py3('kombu') }}
Requires: {{ py3('mock') }}
Requires: {{ py3('oslotest') }}
Requires: {{ py3('testrepository') }}
Requires: {{ py3('testresources') }}
Requires: {{ py3('testscenarios') }}
Requires: {{ py3('testtools') }}
%description test
The testsuite for the VMware vSphere ML2 drivers for OpenStack Neutron
%prep
%autosetup -p1 -n {{ pypi_name }}-{{upstream_version}}
%py_req_cleanup
%build
%{py3_build}
PYTHONPATH=. PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%{py3_install}
mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot}%{_sysconfdir}
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-neutron-dvs-agent.service
install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-neutron-ovsvapp-agent.service
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_unitdir}/openstack-neutron-ovsvapp-agent-monitor.service
chmod +x %{buildroot}%{python3_sitelib}/networking_vsphere/monitor/ovsvapp-agent-monitor.sh
# Copy the drivers provided from python-networking-vsphere for
# Nova. Apparently VMWare drivers are out of the Nova tree, and
# maintained outside Nova, so we need to copy the provided driver.
mkdir -p %{buildroot}%{python3_sitelib}/nova/virt/vmwareapi/
cp -a %{buildroot}%{python3_sitelib}/networking_vsphere/nova/virt/vmwareapi/ovsvapp_vc_driver.py* \
%{buildroot}%{python3_sitelib}/nova/virt/vmwareapi/
cp -a %{buildroot}%{python3_sitelib}/networking_vsphere/nova/virt/vmwareapi/ovsvapp_vmops.py* \
%{buildroot}%{python3_sitelib}/nova/virt/vmwareapi/
%fdupes %{buildroot}%{python3_sitelib}
# %check
# python2 setup.py testr
%post dvs-agent
%systemd_post openstack-neutron-dvs-agent.service
%preun dvs-agent
%systemd_preun openstack-neutron-dvs-agent.service
%postun dvs-agent
%systemd_postun_with_restart openstack-neutron-dvs-agent.service
%post ovsvapp-agent
%systemd_post openstack-neutron-ovsvapp-agent.service
%systemd_post openstack-neutron-ovsvapp-agent-monitor.service
%preun ovsvapp-agent
%systemd_preun openstack-neutron-ovsvapp-agent-monitor.service
%systemd_preun openstack-neutron-ovsvapp-agent.service
%postun ovsvapp-agent
%systemd_postun_with_restart openstack-neutron-ovsvapp-agent-monitor.service
%systemd_postun_with_restart openstack-neutron-ovsvapp-agent.service
%files
%dir %{_sysconfdir}/neutron
%dir %{_sysconfdir}/neutron/plugins
%dir %{_sysconfdir}/neutron/plugins/ml2
%config(noreplace) %{_sysconfdir}/neutron/ml2_conf_vmware_dvs.ini
%config(noreplace) %{_sysconfdir}/neutron/plugins/ml2/ovsvapp_agent.ini
# Patch no longer required in nova stable/newton
%exclude %{_prefix}%{_localstatedir}/tmp/nova.patch
%{_bindir}/ovsvapp-manage-dvpg
%{_bindir}/ovsvapp-manage-dvs
%files -n python3-{{ pypi_name }}
%doc README.rst
%license LICENSE
%{python3_sitelib}/networking_vsphere
%{python3_sitelib}/networking_vsphere-*.egg-info
%{python3_sitelib}/nova/virt/vmwareapi/*
# Part of test subpackage
%exclude %{python3_sitelib}/networking_vsphere/tests
%files dvs-agent
%{_unitdir}/openstack-neutron-dvs-agent.service
%{_bindir}/neutron-dvs-agent
%files ovsvapp-agent
%{_unitdir}/openstack-neutron-ovsvapp-agent.service
%{_unitdir}/openstack-neutron-ovsvapp-agent-monitor.service
%{_bindir}/neutron-ovsvapp-agent
%{_bindir}/neutron-ovsvapp-agent-monitor
%{_bindir}/neutron-ovsvapp-db-manage
%files doc
%license LICENSE
%doc doc/build/html
%files test
%{python3_sitelib}/networking_vsphere/tests
%changelog

15
openstack/networking-vsphere/openstack-neutron-dvs-agent.service
View File

@ -1,15 +0,0 @@
[Unit]
Description=Openstack Neutron VMware DVS Plugin Agent
After=syslog.target network.target
[Service]
Type=simple
User=neutron
ExecStart=/usr/bin/neutron-dvs-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/vmware_dvs_agent.ini --log-file /var/log/neutron/vmware-dvs-agent.log
PrivateTmp=false
KillMode=process
Restart=always
[Install]
WantedBy=multi-user.target

15
openstack/networking-vsphere/openstack-neutron-ovsvapp-agent-monitor.service
View File

@ -1,15 +0,0 @@
[Unit]
Description=Openstack Neutron VMware OVSvApp Agent Monitor
After=syslog.target network.target openstack-neutron-vsphere-ovsvapp-agent.service
[Service]
Type=simple
User=root
ExecStart=/usr/bin/neutron-ovsvapp-agent-monitor --log-file /var/log/neutron/ovsvapp-agent-monitor.log
PrivateTmp=false
KillMode=process
Restart=always
[Install]
WantedBy=multi-user.target

16
openstack/networking-vsphere/openstack-neutron-ovsvapp-agent.service
View File

@ -1,16 +0,0 @@
[Unit]
Description=Openstack Neutron VMware OVSvApp Plugin Agent
After=syslog.target network.target
Wants=openvswitch.service
[Service]
Type=simple
User=neutron
ExecStart=/usr/bin/neutron-ovsvapp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ovsvapp_agent.ini --log-file /var/log/neutron/ovsvapp-agent.log
PrivateTmp=false
KillMode=process
Restart=always
[Install]
WantedBy=multi-user.target

43
openstack/vmware-nsx-tempest-plugin/vmware-nsx-tempest-plugin.spec.j2
View File

@ -1,43 +0,0 @@
{% set pypi_name = 'vmware-nsx-tempest-plugin' %}
{% set rpm_release = '1' %}
{% set source=fetch_source('https://tarballs.openstack.org/vmware-nsx-tempest-plugin/vmware-nsx-tempest-plugin-master.tar.gz') %}
{% set upstream_version = upstream_version() %}
Name: {{ py2name(py_versions='py3') }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: Tempest plugin for the vmware-nsx project
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://opendev.org/x/{{ pypi_name }}
Source0: {{ source|basename }}
BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: {{ py3('pbr') }}
Requires: {{ py2pkg('tempest') }}
Requires: {{ py3('neutron-lib') }}
Requires: {{ py3('pbr') }}
BuildArch: noarch
%description
This package contains Tempest tests to cover the vmware-nsx project.
Additionally it provides a plugin to automatically load these tests into Tempest.
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build
%{py3_build}
%install
%{py3_install}
%fdupes %{buildroot}%{python3_sitelib}
%files
%license LICENSE
%doc README.rst
%{python3_sitelib}/vmware_nsx_tempest_plugin
%{python3_sitelib}/*.egg-info
%changelog

77
openstack/vmware-nsx/vmware-nsx.spec.j2
View File

@ -1,77 +0,0 @@
{% set pypi_name = 'vmware-nsx' %}
{% set source = fetch_source('https://tarballs.openstack.org/vmware-nsx/vmware-nsx-master.tar.gz') %}
{% set upstream_version = upstream_version() %}
{% set rpm_release = '1' %}
Name: {{ py2name(py_versions=['py3']) }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: VMware-NSX family of Neutron plugins
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://docs.openstack.org/vmware-nsx
Source0: {{ source|basename }}
BuildRequires: openstack-macros
BuildRequires: {{ py3('pbr') }}
Requires: {{ py3('PrettyTable') }}
Requires: {{ py3('SQLAlchemy') }}
Requires: {{ py3('decorator') }}
Requires: {{ py3('eventlet') }}
Requires: {{ py3('httplib2') }}
Requires: {{ py3('netaddr') }}
Requires: {{ py3('python-openstackclient') }}
Requires: {{ py3('osc-lib') }}
Requires: {{ py3('oslo.concurrency') }}
Requires: {{ py3('oslo.config') }}
Requires: {{ py3('oslo.db') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('stevedore') }}
Requires: {{ py3('tenacity') }}
Requires: {{ py3('vmware-nsxlib') }}
BuildArch: noarch
%description
VMWare NSX plugins for the OpenStack Neutron component
%package -n python-vmware-nsx-doc
Summary: Documentation for vmware-nsx
Group: Documentation/HTML
BuildRequires: fdupes
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('openstackdocstheme') }}
%description -n python-vmware-nsx-doc
VMWare NSX plugins for the OpenStack Neutron component
This package contains the documentation
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build
%{py3_build}
# generate html docs
PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%fdupes doc/build/html/
%install
%{py3_install}
%files
%license LICENSE
%{python3_sitelib}/vmware_nsx
%{python3_sitelib}/*.egg-info
%{_bindir}/neutron-check-nsx-config
%{_bindir}/nsxadmin
%{_bindir}/nsx-migration
%files -n python-vmware-nsx-doc
%license LICENSE
%doc README.rst doc/build/html
%changelog

101
openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
View File

@ -1,101 +0,0 @@
{% set pypi_name = 'vmware-nsxlib' %}
{% set source = fetch_source('https://tarballs.openstack.org/vmware-nsxlib/vmware-nsxlib-master.tar.gz') %}
{% set upstream_version = upstream_version() %}
{% set rpm_release = '1' %}
# FIXME(jpena): oslosphinx does not work with sphinx > 2
# Set this variable to 1 when that is fixed
%global with_doc 0
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: VMware NSX python library
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://docs.openstack.org/vmware-nsxlib
Source0: {{ source|basename }}
BuildRequires: fdupes
BuildRequires: openstack-macros
BuildRequires: {{ py3('decorator') }}
BuildRequires: {{ py3('eventlet') }}
BuildRequires: {{ py3('neutron-lib') }}
BuildRequires: {{ py3('oslo.log') }}
BuildRequires: {{ py3('oslo.service') }}
BuildRequires: {{ py3('oslotest') }}
BuildRequires: {{ py3('pyOpenSSL') }}
BuildRequires: {{ py3('requests-mock') }}
BuildRequires: {{ py3('stestr') }}
BuildRequires: {{ py3('tenacity') }}
BuildRequires: {{ py3('testrepository') }}
BuildRequires: {{ py3('testresources') }}
BuildRequires: {{ py3('testscenarios') }}
BuildRequires: {{ py3('testtools') }}
BuildArch: noarch
%description
vmware-nsxlib is a python library that interfaces with VMWare NSX
%package -n python3-vmware-nsxlib
Summary: VMware NSX python library
Requires: {{ py3('decorator') }}
Requires: {{ py3('eventlet') }}
Requires: {{ py3('netaddr') }}
Requires: {{ py3('neutron-lib') }}
Requires: {{ py3('oslo.i18n') }}
Requires: {{ py3('oslo.log') }}
Requires: {{ py3('oslo.serialization') }}
Requires: {{ py3('oslo.service') }}
Requires: {{ py3('oslo.utils') }}
Requires: {{ py3('pyOpenSSL') }}
Requires: {{ py3('tenacity') }}
%description -n python3-vmware-nsxlib
vmware-nsxlib is a python library that interfaces with VMWare NSX
This package contains the Python 3.x module.
%if 0%{?with_doc}
%package -n python-vmware-nsxlib-doc
Summary: Documentation for vmware-nsxlib
Group: Documentation/HTML
BuildRequires: {{ py3('Sphinx') }}
BuildRequires: {{ py3('oslosphinx') }}
%description -n python-vmware-nsxlib-doc
vmware-nsxlib is a python library that interfaces with VMWare NSX
This package contains the documentation
%endif
%prep
%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build
%{py3_build}
%if 0%{?with_doc}
# generate html docs
PBR_VERSION={{ upstream_version }} %sphinx_build -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%fdupes doc/build/html/
%endif
%install
%{py3_install}
# remove duplicates
%fdupes %{buildroot}%{python3_sitelib}
%check
%{openstack_stestr_run}
%files -n python3-vmware-nsxlib
%license LICENSE
%{python3_sitelib}/vmware_nsxlib
%{python3_sitelib}/*.egg-info
%if 0%{?with_doc}
%files -n python-vmware-nsxlib-doc
%license LICENSE
%doc README.rst doc/build/html
%endif
%changelog