diff --git a/ironic-python-agent-5.0.4.tar.gz b/ironic-python-agent-5.0.4.tar.gz new file mode 100644 index 0000000..6c28517 Binary files /dev/null and b/ironic-python-agent-5.0.4.tar.gz differ diff --git a/ironic-python-agent-7.0.1.tar.gz b/ironic-python-agent-7.0.1.tar.gz deleted file mode 100644 index b00c7d2..0000000 Binary files a/ironic-python-agent-7.0.1.tar.gz and /dev/null differ diff --git a/openstack-ironic-python-agent.spec b/openstack-ironic-python-agent.spec index 766209f..c8ea622 100644 --- a/openstack-ironic-python-agent.spec +++ b/openstack-ironic-python-agent.spec @@ -1,176 +1,139 @@ -%{?!_licensedir:%global license %%doc} -%{!?upstream_version: %global upstream_version %{version}} - -%global with_doc 1 -%global sname ironic-python-agent - -Name: openstack-ironic-python-agent -Summary: A python agent for provisioning and deprovisioning bare metal servers -Version: 7.0.1 -Release: 2 -License: ASL 2.0 -URL: https://github.com/openstack/ironic-python-agent - -Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz -Source1: openstack-ironic-python-agent.service -Source2: ironic-python-agent-dist.conf -# Required for tarball sources verification - -BuildArch: noarch - -# Required for tarball sources verification -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-devel -BuildRequires: systemd -# These packages are required for running unit tests -BuildRequires: python3-cryptography -BuildRequires: python3-eventlet -BuildRequires: python3-ironic-lib -BuildRequires: python3-iso8601 -BuildRequires: python3-mock -BuildRequires: python3-oslo-config -BuildRequires: python3-oslo-concurrency -BuildRequires: python3-oslo-log -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-service -BuildRequires: python3-oslo-utils -BuildRequires: python3-oslotest -BuildRequires: python3-pecan -BuildRequires: python3-psutil -BuildRequires: python3-requests -BuildRequires: python3-stevedore -BuildRequires: python3-werkzeug -BuildRequires: openstack-macros -BuildRequires: python3-stestr -BuildRequires: python3-netifaces -BuildRequires: python3-pint -BuildRequires: python3-pyudev -BuildRequires: python3-rtslib -BuildRequires: python3-tenacity - -Requires: python3-ironic-python-agent = %{version}-%{release} -%{?systemd_requires} - +%global _empty_manifest_terminate_build 0 +Name: openstack-ironic-python-agent +Version: 5.0.4 +Release: 1 +Summary: Ironic Python Agent Ramdisk +License: Apache-2.0 +URL: https://docs.openstack.org/ironic-python-agent/ +Source0: https://files.pythonhosted.org/packages/db/a5/82dc9fd11cd69727ed79898222bc279b51d92c1e07a68d9042e6c63dde10/ironic-python-agent-5.0.4.tar.gz +BuildArch: noarch %description -An agent for controlling and deploying Ironic controlled bare metal nodes. - -The ironic-python-agent works with the agent driver in Ironic to provision the -node. Starting with ironic-python-agent running on a ramdisk on the -unprovisioned node, Ironic makes API calls to ironic-python-agent to provision -the machine. This allows for greater control and flexibility of the entire -deployment process. - -The ironic-python-agent may also be used with the original Ironic pxe drivers -as of the Kilo OpenStack release. + Ironic Python Agent Team and repository tags An agent for controlling and +deploying Ironic controlled baremetal nodes.The ironic-python-agent works with +the agent driver in Ironic to provision the node. Starting with ironic-python- +agent running on a ramdisk on the unprovisioned node, Ironic makes API calls to +ironic-python-agent to provision the machine. This allows for greater control +and flexibility of the entire deployment process. %package -n python3-ironic-python-agent -Summary: Python library for the ironic python agent. -%{?python_provide:%python_provide python3-ironic-python-agent} - -Requires: python3-cryptography >= 2.3 -Requires: python3-eventlet >= 0.18.2 -Requires: python3-ironic-lib >= 4.5.0 -Requires: python3-netifaces >= 0.10.4 -Requires: python3-oslo-concurrency >= 3.26.0 -Requires: python3-oslo-config -Requires: python3-oslo-log >= 3.36.0 -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-oslo-service >= 1.24.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-pint >= 0.5 -Requires: python3-psutil >= 3.2.2 -Requires: python3-pyudev >= 0.18 -Requires: python3-requests >= 2.14.2 -Requires: python3-rtslib >= 2.1.65 -Requires: python3-stevedore >= 1.20.0 -Requires: python3-systemd -Requires: python3-werkzeug >= 1.0.1 -Requires: python3-tenacity >= 6.2.0 - -Requires: network-scripts - +Summary: Ironic Python Agent Ramdisk +Provides: python-ironic-python-agent +# Base build requires +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr +BuildRequires: python3-pip +BuildRequires: python3-wheel +# General requires +BuildRequires: python3-pint +BuildRequires: python3-wsme +BuildRequires: python3-eventlet +BuildRequires: python3-ironic-lib +BuildRequires: python3-iso8601 +BuildRequires: python3-netaddr +BuildRequires: python3-netifaces +BuildRequires: python3-oslo-concurrency +BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-log +BuildRequires: python3-oslo-serialization +BuildRequires: python3-oslo-service +BuildRequires: python3-oslo-utils +BuildRequires: python3-pecan +BuildRequires: python3-psutil +BuildRequires: python3-pyudev +BuildRequires: python3-requests +BuildRequires: python3-rtslib-fb +BuildRequires: python3-six +BuildRequires: python3-stevedore +# General requires +Requires: python3-pint +Requires: python3-wsme +Requires: python3-eventlet +Requires: python3-ironic-lib +Requires: python3-iso8601 +Requires: python3-netaddr +Requires: python3-netifaces +Requires: python3-oslo-concurrency +Requires: python3-oslo-config +Requires: python3-oslo-log +Requires: python3-oslo-serialization +Requires: python3-oslo-service +Requires: python3-oslo-utils +Requires: python3-pbr +Requires: python3-pecan +Requires: python3-psutil +Requires: python3-pyudev +Requires: python3-requests +Requires: python3-rtslib-fb +Requires: python3-six +Requires: python3-stevedore %description -n python3-ironic-python-agent -Python library for ironic python agent. + Ironic Python Agent Team and repository tags An agent for controlling and +deploying Ironic controlled baremetal nodes.The ironic-python-agent works with +the agent driver in Ironic to provision the node. Starting with ironic-python- +agent running on a ramdisk on the unprovisioned node, Ironic makes API calls to +ironic-python-agent to provision the machine. This allows for greater control +and flexibility of the entire deployment process. -%if 0%{?with_doc} -%package -n python-ironic-python-agent-doc -Summary: Documentation for ironic python agent. -BuildRequires: python3-sphinx -BuildRequires: python3-sphinxcontrib-apidoc -BuildRequires: python3-sphinxcontrib-httpdomain -BuildRequires: python3-sphinxcontrib-pecanwsme -BuildRequires: python3-openstackdocstheme - -%description -n python-ironic-python-agent-doc -Documentation for ironic python agent. -%endif +%package help +Summary: Ironic Python Agent Ramdisk +Provides: python3-ironic-python-agent-doc +%description help + Ironic Python Agent Team and repository tags An agent for controlling and +deploying Ironic controlled baremetal nodes.The ironic-python-agent works with +the agent driver in Ironic to provision the node. Starting with ironic-python- +agent running on a ramdisk on the unprovisioned node, Ironic makes API calls to +ironic-python-agent to provision the machine. This allows for greater control +and flexibility of the entire deployment process. %prep -%autosetup -v -p1 -n ironic-python-agent-%{upstream_version} - -# Remove the requirements file so that pbr hooks don't add it -# to distutils requires_dist config -%py_req_cleanup +%autosetup -n ironic-python-agent-%{version} %build -%{py3_build} +%py3_build %install -%{py3_install} +%py3_install -%if 0%{?with_doc} -export PBR_VERSION=%{version} -export PYTHONPATH=. -sphinx-build -b html -d doc/build/doctrees doc/source doc/build/html -# Remove build docs leftovers -rm -rf doc/build/html/.{doctrees,buildinfo} -%endif +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . -# install systemd scripts -mkdir -p %{buildroot}%{_unitdir} -install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir} -# Install distribution config -install -p -D -m 640 %{SOURCE2} %{buildroot}/%{_sysconfdir}/ironic-python-agent/ironic-python-agent-dist.conf +%files -n python3-ironic-python-agent -f filelist.lst +%dir %{python3_sitelib}/* -%check - -export PYTHON=%{__python3} -stestr --test-path ironic_python_agent/tests/unit run - -%files -%doc README.rst -%license LICENSE -%config(noreplace) %attr(-,root,root) %{_sysconfdir}/ironic-python-agent -%{_bindir}/ironic-python-agent -%{_bindir}/ironic-collect-introspection-data -%{_unitdir}/openstack-ironic-python-agent.service - -%files -n python3-ironic-python-agent -%license LICENSE -%{python3_sitelib}/ironic_python_agent -%{python3_sitelib}/ironic_python_agent*.egg-info - -%if 0%{?with_doc} -%files -n python-ironic-python-agent-doc -%doc doc/build/html -%license LICENSE -%endif - -%post -%systemd_post openstack-ironic-python-agent.service - -%preun -%systemd_preun openstack-ironic-python-agent.service - -%postun -%systemd_postun_with_restart openstack-ironic-python-agent.service +%files help -f doclist.lst +%{_docdir}/* %changelog +* Mon Nov 08 2021 OpenStack_SIG - 5.0.4-1 +- Downgrade package python3-ironic-python-agent to version 5.0.4 + * Tue Aug 24 2021 huangtianhua 7.0.1-2 -- Fix oslo-config requires +- Fix oslo-config requires * Mon Jul 26 2021 liksh 7.0.1-1 - Update to 7.0.1