!15 修复RPM软件包结构
From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua
This commit is contained in:
openeuler-ci-bot
Gitee
commit
26f8b1e0cd
@ -2,13 +2,12 @@
|
||||
%global modulename ironic_inspector
|
||||
%{!?upstream_version: %global upstream_version %{version}}
|
||||
|
||||
%global with_doc 0
|
||||
%global with_tests 1
|
||||
|
||||
Name: openstack-ironic-inspector
|
||||
Summary: Hardware introspection service for OpenStack Ironic
|
||||
Version: 10.6.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/ironic-inspector
|
||||
|
||||
@ -67,6 +66,79 @@ BuildRequires: python3-jsonpath-rw
|
||||
BuildRequires: python3-retrying
|
||||
BuildRequires: python3-pytz
|
||||
|
||||
Requires: openstack-ironic-inspector-api
|
||||
Requires: openstack-ironic-inspector-conductor
|
||||
Requires: openstack-ironic-inspector-dnsmasq
|
||||
|
||||
Provides: openstack-ironic-discoverd = %{upstream_version}
|
||||
|
||||
%description
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains Python modules and an ironic-inspector service combining
|
||||
API and conductor in one binary.
|
||||
|
||||
%package -n openstack-ironic-inspector-dnsmasq
|
||||
Summary: DHCP service for ironic-inspector using dnsmasq
|
||||
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
Requires: dnsmasq
|
||||
|
||||
%description -n openstack-ironic-inspector-dnsmasq
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains a dnsmasq service pre-configured for using with
|
||||
ironic-inspector.
|
||||
|
||||
%package -n openstack-ironic-inspector-conductor
|
||||
Summary: Conductor service for Ironic Inspector.
|
||||
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-conductor
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector conductor service, which can be used
|
||||
to split ironic-inspector into API and conductor processes.
|
||||
|
||||
%package -n openstack-ironic-inspector-api
|
||||
Summary: WSGI service service for Ironic Inspector.
|
||||
|
||||
Requires: openstack-ironic-inspector-common = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-api
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector WSGI service, which can be used
|
||||
to split ironic-inspector into API and conductor processes.
|
||||
|
||||
%package -n openstack-ironic-inspector-common
|
||||
Summary: Contains the common files required by the service
|
||||
|
||||
Requires: python3-%{service} = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-common
|
||||
Contains the common files required by the service
|
||||
|
||||
%package -n python3-%{service}
|
||||
Summary: %{service} source code
|
||||
|
||||
%{?systemd_requires}
|
||||
|
||||
Requires: python3-alembic >= 1.4.2
|
||||
@ -104,84 +176,14 @@ Requires: python3-tenacity >= 6.2.0
|
||||
Requires: python3-yaml >= 5.3.1
|
||||
Requires: python3-oslo-upgradecheck >= 1.2.0
|
||||
|
||||
|
||||
Obsoletes: openstack-ironic-discoverd < 1.1.1
|
||||
Provides: openstack-ironic-discoverd = %{upstream_version}
|
||||
|
||||
%description
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains Python modules and an ironic-inspector service combining
|
||||
API and conductor in one binary.
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package -n openstack-ironic-inspector-doc
|
||||
Summary: Documentation for Ironic Inspector.
|
||||
|
||||
BuildRequires: python3-sphinx
|
||||
BuildRequires: python3-openstackdocstheme
|
||||
BuildRequires: python3-sphinxcontrib-apidoc
|
||||
# BuildRequires: python3-sphinxcontrib-rsvgconverter
|
||||
|
||||
%description -n openstack-ironic-inspector-doc
|
||||
Documentation for Ironic Inspector.
|
||||
%endif
|
||||
|
||||
%package -n openstack-ironic-inspector-dnsmasq
|
||||
Summary: DHCP service for ironic-inspector using dnsmasq
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: dnsmasq
|
||||
|
||||
%description -n openstack-ironic-inspector-dnsmasq
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains a dnsmasq service pre-configured for using with
|
||||
ironic-inspector.
|
||||
|
||||
%package -n openstack-ironic-inspector-conductor
|
||||
Summary: Conductor service for Ironic Inspector.
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-conductor
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector conductor service, which can be used
|
||||
to split ironic-inspector into API and conductor processes.
|
||||
|
||||
%package -n openstack-ironic-inspector-api
|
||||
Summary: WSGI service service for Ironic Inspector.
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description -n openstack-ironic-inspector-api
|
||||
Ironic Inspector is an auxiliary service for discovering hardware properties
|
||||
for a node managed by OpenStack Ironic. Hardware introspection or hardware
|
||||
properties discovery is a process of getting hardware parameters required for
|
||||
scheduling from a bare metal node, given it’s power management credentials
|
||||
(e.g. IPMI address, user name and password).
|
||||
|
||||
This package contains an ironic-inspector WSGI service, which can be used
|
||||
to split ironic-inspector into API and conductor processes.
|
||||
%description -n python3-%{service}
|
||||
It contains the project python source code
|
||||
|
||||
%package -n python3-%{service}-tests
|
||||
Summary: %{service} Unit Tests
|
||||
%{?python_provide:%python_provide python2-%{service}-tests}
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: python3-%{service} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{service}-tests
|
||||
It contains the unit tests
|
||||
@ -194,11 +196,6 @@ It contains the unit tests
|
||||
|
||||
%build
|
||||
%{py3_build}
|
||||
%if 0%{?with_doc}
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
%endif
|
||||
|
||||
%install
|
||||
%{py3_install}
|
||||
@ -252,30 +249,7 @@ PYTHON=%{__python3} stestr run --test-path ironic_inspector.test.unit
|
||||
%files
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%config(noreplace) %attr(-,root,ironic-inspector) %{_sysconfdir}/ironic-inspector
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector
|
||||
%{_sysconfdir}/sudoers.d/ironic-inspector
|
||||
%{python3_sitelib}/%{modulename}
|
||||
%{python3_sitelib}/%{modulename}-*.egg-info
|
||||
%exclude %{python3_sitelib}/%{modulename}/test
|
||||
%{_bindir}/ironic-inspector
|
||||
%{_bindir}/ironic-inspector-rootwrap
|
||||
%{_bindir}/ironic-inspector-dbsync
|
||||
%{_bindir}/ironic-inspector-status
|
||||
%{_bindir}/ironic-inspector-migrate-data
|
||||
%{_unitdir}/openstack-ironic-inspector.service
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector/dhcp-hostsdir
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector/ramdisk/
|
||||
%doc %{_mandir}/man8/ironic-inspector.8.gz
|
||||
%exclude %{python3_sitelib}/%{modulename}_tests.egg-info
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files -n openstack-ironic-inspector-doc
|
||||
%license LICENSE
|
||||
%doc CONTRIBUTING.rst doc/build/html
|
||||
%endif
|
||||
|
||||
%files -n openstack-ironic-inspector-dnsmasq
|
||||
%license LICENSE
|
||||
@ -290,6 +264,29 @@ PYTHON=%{__python3} stestr run --test-path ironic_inspector.test.unit
|
||||
%license LICENSE
|
||||
%{_bindir}/ironic-inspector-api-wsgi
|
||||
|
||||
%files -n openstack-ironic-inspector-common
|
||||
%license LICENSE
|
||||
%config(noreplace) %attr(-,root,ironic-inspector) %{_sysconfdir}/ironic-inspector
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-ironic-inspector
|
||||
%{_sysconfdir}/sudoers.d/ironic-inspector
|
||||
%{_bindir}/ironic-inspector
|
||||
%{_bindir}/ironic-inspector-rootwrap
|
||||
%{_bindir}/ironic-inspector-dbsync
|
||||
%{_bindir}/ironic-inspector-status
|
||||
%{_bindir}/ironic-inspector-migrate-data
|
||||
%{_unitdir}/openstack-ironic-inspector.service
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_sharedstatedir}/ironic-inspector/dhcp-hostsdir
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector
|
||||
%attr(-,ironic-inspector,ironic-inspector) %{_localstatedir}/log/ironic-inspector/ramdisk/
|
||||
|
||||
%files -n python3-%{service}
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/%{modulename}
|
||||
%{python3_sitelib}/%{modulename}-*.egg-info
|
||||
%exclude %{python3_sitelib}/%{modulename}/test
|
||||
%exclude %{python3_sitelib}/%{modulename}_tests.egg-info
|
||||
|
||||
%files -n python3-%{service}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/%{modulename}/test
|
||||
@ -329,6 +326,9 @@ exit 0
|
||||
%systemd_postun_with_restart openstack-ironic-inspector-conductor.service
|
||||
|
||||
%changelog
|
||||
* Mon Aug 23 2021 wangxiyuan<wangxiyuan1007@gmail.com> - 10.6.0-2
|
||||
- Correct the package structure.
|
||||
|
||||
* Mon Jul 26 2021 liksh <liks11@chinaunicom.cn> 10.6.0-1
|
||||
- Update to 10.6.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user