Remove STX-Openstack-only packages
The purpose of this change is to remove packages and images that are only used by the STX-Openstack application from this repository, as they're now present in [1]. With the containerization of the STX-Openstack clients (and the subsequent upversion of said packages and images), there was a need to move the folders of this repository to the `starlingx/openstack-armada-app`. Because of that, the packages that are not used by the platform can be removed from this repo, along with the Openstack images. Note that this will not impact the default StarlingX build process, as it's on the `f/antelope` branch. [1] https://opendev.org/starlingx/openstack-armada-app/src/branch/master/upstream/openstack Test Plan: PASS: Make sure the removed packages are not found when trying to build them PASS: Make sure the removed images are not found when trying to build them PEND: Build all remaining packages PEND: Build StarlingX ISO PEND: Install and bootstrap an AIO-SX machine Story: 2010797 Task: 48692 Change-Id: I2945fee471855d3c64a53e55bfffb4b2ce793a8c Signed-off-by: Lucas de Ataides <lucas.deataidesbarreto@windriver.com>
This commit is contained in:
Lucas de Ataides
parent
5cb2a68d49
commit
14d6473fa3
|
|
@ -16,48 +16,19 @@ python3-keystone
|
|||
#openstack-ras
|
||||
openstack-resource-agents
|
||||
|
||||
#python-aodhclient
|
||||
python-aodhclient-doc
|
||||
python3-aodhclient
|
||||
|
||||
#python-barbicanclient
|
||||
python3-barbicanclient
|
||||
|
||||
#python-cinderclient
|
||||
python3-cinderclient
|
||||
|
||||
#python-glanceclient
|
||||
python-glanceclient-doc
|
||||
python3-glanceclient
|
||||
|
||||
#python-gnocchiclient
|
||||
python-gnocchiclient-doc
|
||||
python3-gnocchiclient
|
||||
|
||||
#python-heatclient
|
||||
python3-heatclient
|
||||
|
||||
#python-horizon
|
||||
horizon-doc
|
||||
openstack-dashboard-apache
|
||||
openstack-dashboard
|
||||
python3-django-horizon
|
||||
|
||||
#python-ironicclient
|
||||
python-ironicclient-doc
|
||||
python3-ironicclient
|
||||
|
||||
#python-keystoneclient
|
||||
python-keystoneclient-doc
|
||||
python3-keystoneclient
|
||||
|
||||
#python-neutronclient
|
||||
python3-neutronclient
|
||||
|
||||
#python-novaclient
|
||||
python-novaclient-doc
|
||||
python3-novaclient
|
||||
|
||||
#python-openstackclient
|
||||
python-openstackclient-doc
|
||||
python3-openstackclient
|
||||
|
|
@ -73,10 +44,6 @@ python3-osc-lib
|
|||
#python-oslo-messaging
|
||||
python3-oslo.messaging
|
||||
|
||||
#python-pankoclient
|
||||
python-pankoclient-doc
|
||||
python3-pankoclient
|
||||
|
||||
#python-wsme
|
||||
python3-wsme
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,12 @@ openstack/barbican
|
|||
openstack/keystone
|
||||
openstack/openstack-pkg-tools
|
||||
openstack/openstack-ras
|
||||
openstack/python-aodhclient
|
||||
openstack/python-barbicanclient
|
||||
openstack/python-cinderclient
|
||||
openstack/python-glanceclient
|
||||
openstack/python-gnocchiclient
|
||||
openstack/python-heatclient
|
||||
openstack/python-horizon
|
||||
openstack/python-ironicclient
|
||||
openstack/python-keystoneclient
|
||||
openstack/python-neutronclient
|
||||
openstack/python-novaclient
|
||||
openstack/python-openstackclient
|
||||
openstack/python-openstacksdk
|
||||
openstack/python-osc-lib
|
||||
openstack/python-oslo-messaging
|
||||
openstack/python-pankoclient
|
||||
openstack/python-wsme
|
||||
openstack/rabbitmq-server
|
||||
|
|
|
|||
|
|
@ -1,15 +1 @@
|
|||
openstack/openstack-aodh
|
||||
openstack/openstack-ironic
|
||||
openstack/python-barbican
|
||||
openstack/python-ceilometer
|
||||
openstack/python-cinder
|
||||
openstack/python-glance
|
||||
openstack/python-gnocchi
|
||||
openstack/python-heat/openstack-heat
|
||||
openstack/python-horizon
|
||||
openstack/python-keystone
|
||||
openstack/python-neutron
|
||||
openstack/python-nova
|
||||
openstack/python-openstackclient
|
||||
openstack/python-placement
|
||||
openstack/python-platformclients
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-aodh
|
||||
PROJECT=aodh
|
||||
PROJECT_REPO=https://opendev.org/openstack/aodh.git
|
||||
PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
|
||||
PROFILES="apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-aodh
|
||||
PROJECT=aodh
|
||||
PROJECT_REPO=https://opendev.org/openstack/aodh.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
|
||||
PROFILES="apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-aodh
|
||||
PROJECT=aodh
|
||||
PROJECT_REPO=https://opendev.org/openstack/aodh.git
|
||||
PROJECT_REF=4366d6eae1aad4e15aeca4bc7e8b5e757c7601e8
|
||||
PROJECT_UID=42425
|
||||
PROJECT_GID=42425
|
||||
PIP_PACKAGES="pylint SQLAlchemy gnocchiclient aodhclient"
|
||||
DIST_REPOS="OS"
|
||||
PROFILES="apache"
|
||||
CUSTOMIZATION="\
|
||||
ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \
|
||||
ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf
|
||||
"
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ironic
|
||||
PROJECT=ironic
|
||||
PROJECT_REPO=https://opendev.org/openstack/ironic.git
|
||||
PIP_PACKAGES="pylint alembic pysnmp"
|
||||
DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils"
|
||||
PROFILES="ironic apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ironic
|
||||
PROJECT=ironic
|
||||
PROJECT_REPO=https://opendev.org/openstack/ironic.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pylint alembic pysnmp"
|
||||
DIST_PACKAGES="ipxe-bootimgs tftp-server OpenIPMI ipmitool iproute qemu-img syslinux-tftpboot iscsi-initiator-utils"
|
||||
PROFILES="ironic apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ironic
|
||||
PROJECT=ironic
|
||||
PROJECT_REPO=https://opendev.org/openstack/ironic.git
|
||||
PROJECT_REF=859e51c8b4b8344827b5bba1f9a0b737ffbc1ebc
|
||||
PROJECT_UID=42425
|
||||
PROJECT_GID=42425
|
||||
PIP_PACKAGES="pylint alembic pysnmp"
|
||||
DIST_REPOS="OS"
|
||||
DIST_PACKAGES="ipxe tftpd-hpa openipmi ipmitool iproute2 qemu-utils syslinux-common open-iscsi"
|
||||
PROFILES="ironic apache"
|
||||
CUSTOMIZATION="\
|
||||
ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \
|
||||
ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf
|
||||
"
|
||||
UPDATE_SYSTEM_ACCOUNT="yes"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=aodhclient
|
||||
SRC_DIR=$CGCS_BASE/git/python-aodhclient
|
||||
TIS_BASE_SRCREV="1.3.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,198 +0,0 @@
|
|||
%global pypi_name aodhclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global common_desc \
|
||||
This is a client library for Aodh built on the Aodh API. It \
|
||||
provides a Python API (the aodhclient module) and a command-line tool.
|
||||
|
||||
Name: python-aodhclient
|
||||
Version: 1.3.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-aodhclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: git
|
||||
|
||||
Requires: python-pbr
|
||||
Requires: python-cliff >= 1.14.0
|
||||
Requires: python-oslo-i18n >= 1.5.0
|
||||
Requires: python-oslo-serialization >= 1.4.0
|
||||
Requires: python-oslo-utils >= 2.0.0
|
||||
Requires: python-keystoneauth1 >= 1.0.0
|
||||
Requires: python-six >= 1.9.0
|
||||
Requires: python-osc-lib >= 1.0.1
|
||||
Requires: python-osprofiler >= 1.4.0
|
||||
Requires: pyparsing
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Aodh API Client
|
||||
|
||||
BuildRequires: python-sphinx
|
||||
# FIXME: remove following line when a new release including https://review.openstack.org/#/c/476759/ is in u-c
|
||||
BuildRequires: python-oslo-sphinx
|
||||
BuildRequires: python-openstackdocstheme
|
||||
BuildRequires: python-keystoneauth1
|
||||
BuildRequires: python-oslo-utils
|
||||
BuildRequires: python-oslo-serialization
|
||||
BuildRequires: python-cliff
|
||||
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
(aodh).
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Aodh Tests
|
||||
Requires: python2-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-pbr
|
||||
Requires: python3-cliff >= 1.14.0
|
||||
Requires: python3-oslo-i18n >= 1.5.0
|
||||
Requires: python3-oslo-serialization >= 1.4.0
|
||||
Requires: python3-oslo-utils >= 2.0.0
|
||||
Requires: python3-keystoneauth1 >= 1.0.0
|
||||
Requires: python3-six >= 1.9.0
|
||||
Requires: python3-osc-lib >= 1.0.1
|
||||
Requires: python3-osprofiler >= 1.4.0
|
||||
Requires: python3-pyparsing
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Aodh Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python3_version}
|
||||
ln -s ./aodh-%{python3_version} %{buildroot}%{_bindir}/aodh-3
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python2_version}
|
||||
ln -s ./aodh-%{python2_version} %{buildroot}%{_bindir}/aodh-2
|
||||
|
||||
ln -s ./aodh-2 %{buildroot}%{_bindir}/aodh
|
||||
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
# remove the sphinx-build leftovers
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
|
||||
# STX: stage wheels
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/aodhclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_bindir}/aodh
|
||||
%{_bindir}/aodh-2
|
||||
%{_bindir}/aodh-%{python2_version}
|
||||
%exclude %{python2_sitelib}/aodhclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/aodhclient/tests
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{pypi_name}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_bindir}/aodh-3
|
||||
%{_bindir}/aodh-%{python3_version}
|
||||
%exclude %{python3_sitelib}/aodhclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/aodhclient/tests
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1.1.1-1
|
||||
- Update to 1.1.1
|
||||
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
%global pypi_name aodhclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global common_desc \
|
||||
This is a client library for Aodh built on the Aodh API. It \
|
||||
provides a Python API (the aodhclient module) and a command-line tool.
|
||||
|
||||
Name: python-aodhclient
|
||||
Version: 1.1.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-aodhclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: git
|
||||
|
||||
Requires: python-pbr
|
||||
Requires: python-cliff >= 1.14.0
|
||||
Requires: python-oslo-i18n >= 1.5.0
|
||||
Requires: python-oslo-serialization >= 1.4.0
|
||||
Requires: python-oslo-utils >= 2.0.0
|
||||
Requires: python-keystoneauth1 >= 1.0.0
|
||||
Requires: python-six >= 1.9.0
|
||||
Requires: python-osc-lib >= 1.0.1
|
||||
Requires: pyparsing
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Aodh API Client
|
||||
|
||||
BuildRequires: python-sphinx
|
||||
# FIXME: remove following line when a new release including https://review.openstack.org/#/c/476759/ is in u-c
|
||||
BuildRequires: python-oslo-sphinx
|
||||
BuildRequires: python-openstackdocstheme
|
||||
BuildRequires: python-keystoneauth1
|
||||
BuildRequires: python-oslo-utils
|
||||
BuildRequires: python-oslo-serialization
|
||||
BuildRequires: python-cliff
|
||||
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
(aodh).
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Aodh Tests
|
||||
Requires: python2-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Aodh
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-pbr
|
||||
Requires: python3-cliff >= 1.14.0
|
||||
Requires: python3-oslo-i18n >= 1.5.0
|
||||
Requires: python3-oslo-serialization >= 1.4.0
|
||||
Requires: python3-oslo-utils >= 2.0.0
|
||||
Requires: python3-keystoneauth1 >= 1.0.0
|
||||
Requires: python3-six >= 1.9.0
|
||||
Requires: python3-osc-lib >= 1.0.1
|
||||
Requires: python3-pyparsing
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Aodh Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python3_version}
|
||||
ln -s ./aodh-%{python3_version} %{buildroot}%{_bindir}/aodh-3
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python2_version}
|
||||
ln -s ./aodh-%{python2_version} %{buildroot}%{_bindir}/aodh-2
|
||||
|
||||
ln -s ./aodh-2 %{buildroot}%{_bindir}/aodh
|
||||
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
# remove the sphinx-build leftovers
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/aodhclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_bindir}/aodh
|
||||
%{_bindir}/aodh-2
|
||||
%{_bindir}/aodh-%{python2_version}
|
||||
%exclude %{python2_sitelib}/aodhclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/aodhclient/tests
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{pypi_name}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_bindir}/aodh-3
|
||||
%{_bindir}/aodh-%{python3_version}
|
||||
%exclude %{python3_sitelib}/aodhclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/aodhclient/tests
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1.1.1-1
|
||||
- Update to 1.1.1
|
||||
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From 59078d1ddd3f5f58007973615a67b6f136831823 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Wed, 27 Oct 2021 16:46:26 +0000
|
||||
Subject: [PATCH] Add wheel package
|
||||
|
||||
Add python3-aodhclient-wheel.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 16 ++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index df1f5e0..0ae5339 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -78,3 +78,19 @@ Description: OpenStack Alarming as a Service - Python 3.x client
|
||||
for more than 10 min.
|
||||
.
|
||||
This package contains the Python 3.x module.
|
||||
+
|
||||
+Package: python3-aodhclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: OpenStack Alarming as a Service - Python 3.x client
|
||||
+ Aodh provides alarming for OpenStack. The alarming component of Aodh, first
|
||||
+ delivered in the Havana version, allows you to set alarms based on threshold
|
||||
+ evaluation for a collection of samples. An alarm can be set on a single meter,
|
||||
+ or on a combination. For example, you may want to trigger an alarm when the
|
||||
+ memory consumption reaches 70% on a given instance if the instance has been up
|
||||
+ for more than 10 min.
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 42e437f..3795caf 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -13,7 +13,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
0001-Add-wheel-package.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-aodhclient
|
||||
debver: 2.1.1-1
|
||||
dl_path:
|
||||
name: python-aodhclient-debian-2.1.1-1.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-aodhclient/-/archive/debian/2.1.1-1/python-aodhclient-debian-2.1.1-1.tar.gz
|
||||
md5sum: 86ee75ba3dec6529b48c816c7ddd317e
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 6d7ca1d59ab9235d431afe7e19eab2a004c40365
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-aodhclient
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-barbican
|
||||
PROJECT=barbican
|
||||
PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
||||
PIP_PACKAGES="pycrypto"
|
||||
PROFILES="fluent"
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-barbican
|
||||
PROJECT=barbican
|
||||
PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pycrypto"
|
||||
PROFILES="fluent"
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-barbican
|
||||
PROJECT=barbican
|
||||
DIST_REPOS="OS"
|
||||
PROJECT_REPO=https://opendev.org/openstack/barbican.git
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
PROJECT_REF=cc076f24e55c24a6fc8e57ca606130090fb6369b
|
||||
PIP_PACKAGES="pycryptodomex"
|
||||
PROFILES="fluent"
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ceilometer
|
||||
PROJECT=ceilometer
|
||||
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
||||
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
||||
DIST_PACKAGES="libvirt ipmitool"
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ceilometer
|
||||
PROJECT=ceilometer
|
||||
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pylint libvirt-python panko==5.0.0 gnocchiclient"
|
||||
DIST_PACKAGES="libvirt ipmitool"
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-ceilometer
|
||||
PROJECT=ceilometer
|
||||
PROJECT_REPO=https://opendev.org/openstack/ceilometer.git
|
||||
PROJECT_REF=bcada72c3aaeeb2a86de3368b1787a9253c9d55b
|
||||
PIP_PACKAGES="\
|
||||
gnocchiclient \
|
||||
libvirt-python \
|
||||
panko==5.0.0
|
||||
"
|
||||
DIST_REPOS="OS"
|
||||
DIST_PACKAGES="\
|
||||
ipmitool \
|
||||
libvirt0 \
|
||||
libvirt-clients \
|
||||
libvirt-daemon \
|
||||
libvirt-daemon-driver-lxc \
|
||||
libvirt-daemon-driver-qemu \
|
||||
libvirt-daemon-driver-storage-gluster \
|
||||
libvirt-login-shell
|
||||
"
|
||||
UPDATE_SYSTEM_ACCOUNT="yes"
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-cinder
|
||||
PROJECT=cinder
|
||||
PROJECT_REPO=https://opendev.org/openstack/cinder.git
|
||||
DIST_PACKAGES="nfs-utils"
|
||||
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
||||
PROFILES="fluent cinder lvm ceph qemu"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-cinder
|
||||
PROJECT=cinder
|
||||
PROJECT_REPO=https://opendev.org/openstack/cinder.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
DIST_PACKAGES="nfs-utils"
|
||||
PIP_PACKAGES="pycrypto python-swiftclient pylint"
|
||||
PROFILES="fluent cinder lvm ceph qemu"
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-cinder
|
||||
PROJECT=cinder
|
||||
DIST_REPOS="OS"
|
||||
PROJECT_REPO=https://opendev.org/openstack/cinder.git
|
||||
PROJECT_REF=79b012fbc8b6bc9dcce2c8c52a6fa63976a0309f
|
||||
PROJECT_UID=42425
|
||||
PROJECT_GID=42425
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
DIST_PACKAGES="nfs-common"
|
||||
PIP_PACKAGES="pycryptodomex python-swiftclient pylint"
|
||||
PROFILES="fluent cinder lvm ceph qemu"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-glance
|
||||
PROJECT=glance
|
||||
PROJECT_REPO=https://opendev.org/openstack/glance.git
|
||||
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
||||
DIST_PACKAGES="postgresql-libs"
|
||||
PROFILES="fluent glance ceph"
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-glance
|
||||
PROJECT=glance
|
||||
PROJECT_REPO=https://opendev.org/openstack/glance.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pycrypto python-swiftclient psutil pylint"
|
||||
DIST_PACKAGES="postgresql-libs"
|
||||
PROFILES="fluent glance ceph"
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-glance
|
||||
PROJECT=glance
|
||||
PROJECT_REPO=https://opendev.org/openstack/glance.git
|
||||
PROJECT_REF=6f03ccd47772e02f810de8fa3158afddc4a9c158
|
||||
DIST_REPOS="OS"
|
||||
UPDATE_SYSTEM_ACCOUNT="yes"
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
PIP_PACKAGES="pycryptodomex python-swiftclient psutil pylint "
|
||||
DIST_PACKAGES="libpq5"
|
||||
PROFILES="fluent glance ceph"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=python-glanceclient
|
||||
SRC_DIR="$CGCS_BASE/git/python-glanceclient"
|
||||
TIS_BASE_SRCREV="2.17.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,209 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname glanceclient
|
||||
%global with_doc 0
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Glance API. There's a Python API (the \
|
||||
glanceclient module), and a command-line script (glance). Each implements \
|
||||
100% of the OpenStack Glance API.
|
||||
|
||||
Name: python-glanceclient
|
||||
Epoch: 1
|
||||
Version: 2.17.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-glanceclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
%{?python_provide:%python_provide python2-glanceclient}
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pbr
|
||||
|
||||
Requires: python2-keystoneauth1 >= 3.6.2
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr
|
||||
Requires: python2-prettytable
|
||||
Requires: python2-pyOpenSSL >= 17.1.0
|
||||
Requires: python2-requests
|
||||
Requires: python2-six >= 1.10.0
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
Requires: python2-warlock
|
||||
Requires: python2-wrapt
|
||||
%else
|
||||
Requires: python-warlock
|
||||
Requires: python-wrapt
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
%{?python_provide:%python_provide python3-glanceclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-keystoneauth1 >= 3.6.2
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-prettytable
|
||||
Requires: python3-pyOpenSSL >= 17.1.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-warlock
|
||||
Requires: python3-wrapt
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Glance API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-pyOpenSSL >= 17.1.0
|
||||
BuildRequires: python2-sphinxcontrib-apidoc
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: python2-warlock
|
||||
%else
|
||||
BuildRequires: python-warlock
|
||||
%endif
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python3_version}
|
||||
ln -s ./glance-%{python3_version} %{buildroot}%{_bindir}/glance-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/glanceclient/tests
|
||||
%endif
|
||||
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python2_version}
|
||||
ln -s ./glance-%{python2_version} %{buildroot}%{_bindir}/glance-2
|
||||
|
||||
ln -s ./glance-2 %{buildroot}%{_bindir}/glance
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/glance.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/glance
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/glanceclient/tests
|
||||
|
||||
%if 0%{?with_doc}
|
||||
# generate html docs
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
# remove the sphinx-build leftovers
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
# generate man page
|
||||
sphinx-build -b man doc/source doc/build/man
|
||||
install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
|
||||
%endif
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/glanceclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/glance.1.gz
|
||||
%endif
|
||||
%{_bindir}/glance
|
||||
%{_bindir}/glance-2
|
||||
%{_bindir}/glance-%{python2_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/glance.1.gz
|
||||
%{_bindir}/glance-3
|
||||
%{_bindir}/glance-%{python3_version}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
%endif
|
||||
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
%changelog
|
||||
* Wed Dec 19 2018 RDO <dev@lists.rdoproject.org> 1:2.13.1-1
|
||||
- Update to 2.13.1
|
||||
|
||||
* Mon Nov 05 2018 RDO <dev@lists.rdoproject.org> 1:2.13.0-1
|
||||
- Update to 2.13.0
|
||||
|
||||
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 1:2.12.1-1
|
||||
- Update to 2.12.1
|
||||
|
||||
|
|
@ -1,190 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname glanceclient
|
||||
%global with_doc 1
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Glance API. There's a Python API (the \
|
||||
glanceclient module), and a command-line script (glance). Each implements \
|
||||
100% of the OpenStack Glance API.
|
||||
|
||||
Name: python-glanceclient
|
||||
Epoch: 1
|
||||
Version: 2.13.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-glanceclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
%{?python_provide:%python_provide python2-glanceclient}
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pbr
|
||||
|
||||
Requires: python2-keystoneauth1 >= 3.6.2
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr
|
||||
Requires: python2-prettytable
|
||||
Requires: python2-pyOpenSSL >= 17.1.0
|
||||
Requires: python2-requests
|
||||
Requires: python2-six >= 1.10.0
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
Requires: python2-warlock
|
||||
Requires: python2-wrapt
|
||||
%else
|
||||
Requires: python-warlock
|
||||
Requires: python-wrapt
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Glance
|
||||
%{?python_provide:%python_provide python3-glanceclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-keystoneauth1 >= 3.6.2
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-prettytable
|
||||
Requires: python3-pyOpenSSL >= 17.1.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-warlock
|
||||
Requires: python3-wrapt
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Glance API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-pyOpenSSL >= 17.1.0
|
||||
BuildRequires: python2-sphinxcontrib-apidoc
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: python2-warlock
|
||||
%else
|
||||
BuildRequires: python-warlock
|
||||
%endif
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python3_version}
|
||||
ln -s ./glance-%{python3_version} %{buildroot}%{_bindir}/glance-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/glanceclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/glance %{buildroot}%{_bindir}/glance-%{python2_version}
|
||||
ln -s ./glance-%{python2_version} %{buildroot}%{_bindir}/glance-2
|
||||
|
||||
ln -s ./glance-2 %{buildroot}%{_bindir}/glance
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/glance.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/glance
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/glanceclient/tests
|
||||
|
||||
%if 0%{?with_doc}
|
||||
# generate html docs
|
||||
sphinx-build -b html doc/source doc/build/html
|
||||
# remove the sphinx-build leftovers
|
||||
rm -rf doc/build/html/.{doctrees,buildinfo}
|
||||
# generate man page
|
||||
sphinx-build -b man doc/source doc/build/man
|
||||
install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
|
||||
%endif
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/glanceclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/glance.1.gz
|
||||
%endif
|
||||
%{_bindir}/glance
|
||||
%{_bindir}/glance-2
|
||||
%{_bindir}/glance-%{python2_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/glance.1.gz
|
||||
%{_bindir}/glance-3
|
||||
%{_bindir}/glance-%{python3_version}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Dec 19 2018 RDO <dev@lists.rdoproject.org> 1:2.13.1-1
|
||||
- Update to 2.13.1
|
||||
|
||||
* Mon Nov 05 2018 RDO <dev@lists.rdoproject.org> 1:2.13.0-1
|
||||
- Update to 2.13.0
|
||||
|
||||
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 1:2.12.1-1
|
||||
- Update to 2.12.1
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From 4c5368b6f9811e195dc12d1a3cecccb176cf720e Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Tue, 26 Oct 2021 23:35:45 +0000
|
||||
Subject: [PATCH] Add support for wheel
|
||||
|
||||
Add support for python3 wheels.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 17 +++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 742257e..f2c1648 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -84,3 +84,20 @@ Description: Client library for Openstack glance server - Python 3.x
|
||||
Python API (the "glanceclient" module), and a command-line script ("glance").
|
||||
.
|
||||
This package provides the Python 3.x module.
|
||||
+
|
||||
+Package: python3-glanceclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: Client library for Openstack Glance server - Python 3.x
|
||||
+ The Glance project provides services for discovering, registering, and
|
||||
+ retrieving virtual machine images over the cloud. They may be stand-alone
|
||||
+ services, or may be used to deliver images from object stores, such as
|
||||
+ OpenStack's Swift service, to Nova's compute nodes.
|
||||
+ .
|
||||
+ This is a client for the Glance which uses the OpenStack Image API. There's a
|
||||
+ Python API (the "glanceclient" module), and a command-line script ("glance").
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index d5d2b14..459f08c 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -12,7 +12,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
|
||||
override_dh_python3:
|
||||
dh_python3 --shebang=/usr/bin/python3
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
0001-Add-support-for-wheel.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-glanceclient
|
||||
debver: 1:3.2.2-2
|
||||
dl_path:
|
||||
name: python-glanceclient-debian-3.2.2-2.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-glanceclient/-/archive/debian/3.2.2-2/python-glanceclient-debian-3.2.2-2.tar.gz
|
||||
md5sum: bc184e7b7d10732f1562fb7cab668711
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 241a99f6816b6f1facbff67a9fb26f4a6a284c0d
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-glanceclient
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-gnocchi
|
||||
PROJECT=gnocchi
|
||||
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
|
||||
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
|
||||
DIST_PACKAGES="python3-rados"
|
||||
PROFILES="gnocchi apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-gnocchi
|
||||
PROJECT=gnocchi
|
||||
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
|
||||
PROJECT_REF=4.3.2
|
||||
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
|
||||
DIST_PACKAGES="python3-rados"
|
||||
PROFILES="gnocchi apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-gnocchi
|
||||
PROJECT=gnocchi
|
||||
PROJECT_REPO=https://github.com/gnocchixyz/gnocchi.git
|
||||
PROJECT_REF=4.3.2
|
||||
PROJECT_UID=42425
|
||||
PROJECT_GID=42425
|
||||
PIP_PACKAGES="pylint SQLAlchemy SQLAlchemy-Utils oslo.db keystonemiddleware gnocchiclient pymemcache psycopg2"
|
||||
DIST_REPOS="OS"
|
||||
DIST_PACKAGES="python3-rados"
|
||||
PROFILES="gnocchi apache"
|
||||
CUSTOMIZATION="\
|
||||
ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \
|
||||
ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf
|
||||
"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=gnocchiclient
|
||||
SRC_DIR=$CGCS_BASE/git/python-gnocchiclient
|
||||
TIS_BASE_SRCREV="7.0.7"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,241 +0,0 @@
|
|||
%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
|
||||
%global pypi_name gnocchiclient
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora} >= 24
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client library for Gnocchi built on the Gnocchi API. It \
|
||||
provides a Python API (the gnocchiclient module) and a command-line tool.
|
||||
|
||||
Name: python-gnocchiclient
|
||||
Version: 7.0.7
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/openstack/%{name}
|
||||
Source0: https://pypi.io/packages/source/g/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
# FIXME(jpena): remove this patch once a version > 7.0.1 is released
|
||||
%if "%{version}" == "7.0.1"
|
||||
Patch0001: 0001-Avoid-using-openstack-doc-tools.patch
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
%{?python_provide:%python_provide python2-gnocchiclient}
|
||||
|
||||
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-tools
|
||||
|
||||
Requires: python2-cliff >= 2.10
|
||||
Requires: python2-osc-lib >= 1.8.0
|
||||
Requires: python2-keystoneauth1 >= 2.0.0
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-futurist
|
||||
Requires: python2-ujson
|
||||
Requires: python2-pbr
|
||||
Requires: python2-iso8601
|
||||
Requires: python2-dateutil
|
||||
Requires: python2-debtcollector
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
Requires: python2-monotonic
|
||||
%else
|
||||
Requires: python-monotonic
|
||||
%endif
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python-%{pypi_name}-doc
|
||||
Summary: Documentation for OpenStack Gnocchi API Client
|
||||
Group: Documentation
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-cliff >= 2.10
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-six
|
||||
BuildRequires: python2-futurist
|
||||
BuildRequires: python2-ujson
|
||||
BuildRequires: python2-sphinx_rtd_theme
|
||||
# test
|
||||
BuildRequires: python2-babel
|
||||
# Runtime requirements needed during documentation build
|
||||
BuildRequires: python2-osc-lib
|
||||
BuildRequires: python2-dateutil
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Gnocchi Tests
|
||||
Requires: python2-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-tools
|
||||
|
||||
Requires: python3-cliff >= 2.10
|
||||
Requires: python3-osc-lib >= 1.8.0
|
||||
Requires: python3-keystoneauth1 >= 2.0.0
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-futurist
|
||||
Requires: python3-ujson
|
||||
Requires: python3-pbr
|
||||
Requires: python3-monotonic
|
||||
Requires: python3-iso8601
|
||||
Requires: python3-dateutil
|
||||
Requires: python3-debtcollector
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Gnocchi Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypi_name}-%{upstream_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
2to3 --write --nobackups %{py3dir}
|
||||
%endif
|
||||
|
||||
# Remove bundled egg-info
|
||||
rm -rf gnocchiclient.egg-info
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py build
|
||||
popd
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
mv %{buildroot}%{_bindir}/gnocchi %{buildroot}%{_bindir}/python3-gnocchi
|
||||
popd
|
||||
%endif
|
||||
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
# rename binaries, make compat symlinks
|
||||
install -m 755 -d %{buildroot}/%{_bindir}
|
||||
pushd %{buildroot}%{_bindir}
|
||||
for i in gnocchi-{2,%{?python2_shortver}}; do
|
||||
ln -s gnocchi $i
|
||||
done
|
||||
%if 0%{?with_python3}
|
||||
for i in gnocchi-{3,%{?python3_shortver}}; do
|
||||
ln -s python3-gnocchi $i
|
||||
done
|
||||
%endif
|
||||
popd
|
||||
|
||||
# Some env variables required to successfully build our doc
|
||||
export PYTHONPATH=.
|
||||
export LANG=en_US.utf8
|
||||
python setup.py build_sphinx -b html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/gnocchi
|
||||
%{_bindir}/gnocchi-2*
|
||||
%{python2_sitelib}/gnocchiclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%exclude %{python2_sitelib}/gnocchiclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/gnocchiclient/tests
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/python3-gnocchi
|
||||
%{_bindir}/gnocchi-3*
|
||||
%{python3_sitelib}/gnocchiclient
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%exclude %{python3_sitelib}/gnocchiclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/gnocchiclient/tests
|
||||
|
||||
%endif
|
||||
|
||||
%files -n python-%{pypi_name}-doc
|
||||
%doc doc/build/html
|
||||
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 7.0.4-1
|
||||
- Update to 7.0.4
|
||||
|
||||
|
|
@ -1,220 +0,0 @@
|
|||
%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
|
||||
%global pypi_name gnocchiclient
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora} >= 24
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client library for Gnocchi built on the Gnocchi API. It \
|
||||
provides a Python API (the gnocchiclient module) and a command-line tool.
|
||||
|
||||
Name: python-gnocchiclient
|
||||
Version: 7.0.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/openstack/%{name}
|
||||
Source0: https://pypi.io/packages/source/g/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
# FIXME(jpena): remove this patch once a version > 7.0.1 is released
|
||||
%if "%{version}" == "7.0.1"
|
||||
Patch0001: 0001-Avoid-using-openstack-doc-tools.patch
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
%{?python_provide:%python_provide python2-gnocchiclient}
|
||||
|
||||
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-tools
|
||||
|
||||
Requires: python2-cliff >= 2.10
|
||||
Requires: python2-osc-lib >= 1.8.0
|
||||
Requires: python2-keystoneauth1 >= 2.0.0
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-futurist
|
||||
Requires: python2-ujson
|
||||
Requires: python2-pbr
|
||||
Requires: python2-iso8601
|
||||
Requires: python2-dateutil
|
||||
Requires: python2-debtcollector
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
Requires: python2-monotonic
|
||||
%else
|
||||
Requires: python-monotonic
|
||||
%endif
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python-%{pypi_name}-doc
|
||||
Summary: Documentation for OpenStack Gnocchi API Client
|
||||
Group: Documentation
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-cliff >= 2.10
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-six
|
||||
BuildRequires: python2-futurist
|
||||
BuildRequires: python2-ujson
|
||||
BuildRequires: python2-sphinx_rtd_theme
|
||||
# test
|
||||
BuildRequires: python2-babel
|
||||
# Runtime requirements needed during documentation build
|
||||
BuildRequires: python2-osc-lib
|
||||
BuildRequires: python2-dateutil
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Gnocchi Tests
|
||||
Requires: python2-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Gnocchi
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-tools
|
||||
|
||||
Requires: python3-cliff >= 2.10
|
||||
Requires: python3-osc-lib >= 1.8.0
|
||||
Requires: python3-keystoneauth1 >= 2.0.0
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-futurist
|
||||
Requires: python3-ujson
|
||||
Requires: python3-pbr
|
||||
Requires: python3-monotonic
|
||||
Requires: python3-iso8601
|
||||
Requires: python3-dateutil
|
||||
Requires: python3-debtcollector
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Gnocchi Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
%{common_desc}
|
||||
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypi_name}-%{upstream_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
2to3 --write --nobackups %{py3dir}
|
||||
%endif
|
||||
|
||||
# Remove bundled egg-info
|
||||
rm -rf gnocchiclient.egg-info
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py build
|
||||
popd
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
mv %{buildroot}%{_bindir}/gnocchi %{buildroot}%{_bindir}/python3-gnocchi
|
||||
popd
|
||||
%endif
|
||||
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
|
||||
# rename binaries, make compat symlinks
|
||||
install -m 755 -d %{buildroot}/%{_bindir}
|
||||
pushd %{buildroot}%{_bindir}
|
||||
for i in gnocchi-{2,%{?python2_shortver}}; do
|
||||
ln -s gnocchi $i
|
||||
done
|
||||
%if 0%{?with_python3}
|
||||
for i in gnocchi-{3,%{?python3_shortver}}; do
|
||||
ln -s python3-gnocchi $i
|
||||
done
|
||||
%endif
|
||||
popd
|
||||
|
||||
# Some env variables required to successfully build our doc
|
||||
export PYTHONPATH=.
|
||||
export LANG=en_US.utf8
|
||||
python setup.py build_sphinx -b html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/gnocchi
|
||||
%{_bindir}/gnocchi-2*
|
||||
%{python2_sitelib}/gnocchiclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%exclude %{python2_sitelib}/gnocchiclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/gnocchiclient/tests
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/python3-gnocchi
|
||||
%{_bindir}/gnocchi-3*
|
||||
%{python3_sitelib}/gnocchiclient
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%exclude %{python3_sitelib}/gnocchiclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/gnocchiclient/tests
|
||||
|
||||
%endif
|
||||
|
||||
%files -n python-%{pypi_name}-doc
|
||||
%doc doc/build/html
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 7.0.4-1
|
||||
- Update to 7.0.4
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 1cdba6b7884878b91b34321d8e6cb48aadb18165 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Tue, 26 Oct 2021 23:51:34 +0000
|
||||
Subject: [PATCH] Add python3 wheel
|
||||
|
||||
Add python3-gnocchiclient-wheel
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 18 ++++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index c80f5f7..e4341b6 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -81,3 +81,21 @@ Description: bindings to the OpenStack Gnocchi API - Python 3.x
|
||||
HTTP REST API.
|
||||
.
|
||||
This package contains the Python 3.x module.
|
||||
+
|
||||
+Package: python3-gnocchiclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: bindings to the OpenStack Gnocchi API - Python 3.x
|
||||
+ This is a client for OpenStack gnocchi API. There's a Python API (the
|
||||
+ gnocchiclient module), and a command-line script. Each implements the entire
|
||||
+ OpenStack Gnocchi API.
|
||||
+ .
|
||||
+ Gnocchi is a service for managing a set of resources and storing metrics about
|
||||
+ them, in a scalable and resilient way. Its functionalities are exposed over an
|
||||
+ HTTP REST API.
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
+
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index df1b32a..0cee15d 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -13,7 +13,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
|
||||
# Generate bash completion
|
||||
mkdir -p $(CURDIR)/debian/python3-gnocchiclient/usr/share/bash-completion/completions
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 8f239c761ac065f0faa6a8d4d66704f583767fb1 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:57:22 +0000
|
||||
Subject: [PATCH] Remove openstackclient
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
tool
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index c80f5f7..87e4cb8 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -23,7 +23,6 @@ Build-Depends-Indep:
|
||||
python3-keystoneauth1,
|
||||
python3-keystonemiddleware <!nocheck>,
|
||||
python3-monotonic,
|
||||
- python3-openstackclient,
|
||||
python3-osc-lib,
|
||||
python3-pytest <!nocheck>,
|
||||
python3-pytest-xdist <!nocheck>,
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0001-Add-python3-wheel.patch
|
||||
remove-openstackcleint.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-gnocchiclient
|
||||
debver: 7.0.6-1
|
||||
dl_path:
|
||||
name: python-gnocchiclient-debian-7.0.6-1.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-gnocchiclient/-/archive/debian/7.0.6-1/python-gnocchiclient-debian-7.0.6-1.tar.gz
|
||||
md5sum: 3ee6a1ee65fb1a4dbd86038257b33c04
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 7bda415fa4d29f60903a123c2b064a5fcbc9d44f
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-gnocchiclient
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-heat
|
||||
PROJECT=heat
|
||||
PROJECT_REPO=https://opendev.org/openstack/heat.git
|
||||
PIP_PACKAGES="pycrypto pylint"
|
||||
PROFILES="fluent heat apache"
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-heat
|
||||
PROJECT=heat
|
||||
PROJECT_REPO=https://opendev.org/openstack/heat.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pycrypto pylint"
|
||||
PROFILES="fluent heat apache"
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-heat
|
||||
PROJECT=heat
|
||||
PROJECT_REPO=https://opendev.org/openstack/heat.git
|
||||
PROJECT_REF=5466ede853bde7d636943cba017ed8265dcfd260
|
||||
DIST_REPOS="OS"
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
PIP_PACKAGES="pycryptodomex pylint"
|
||||
DIST_PACKAGES="curl libxslt1.1"
|
||||
PROFILES="fluent heat apache"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
TAR_NAME=python-heatclient
|
||||
SRC_DIR=$CGCS_BASE/git/python-heatclient
|
||||
TIS_BASE_SRCREV="1.18.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
||||
|
|
@ -1,218 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname heatclient
|
||||
%global with_doc 0
|
||||
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Heat API. There's a Python API (the \
|
||||
heatclient module), and a command-line script (heat). Each implements 100% of \
|
||||
the OpenStack Heat API.
|
||||
|
||||
Name: python-heatclient
|
||||
Version: 1.18.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-heatclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
%{?python_provide:%python_provide python2-heatclient}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: git
|
||||
|
||||
Requires: python2-babel
|
||||
Requires: python2-iso8601
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-osc-lib >= 1.8.0
|
||||
Requires: python2-prettytable
|
||||
Requires: python2-pbr
|
||||
Requires: python2-six
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-swiftclient >= 3.2.0
|
||||
Requires: python2-requests
|
||||
Requires: python2-cliff
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-pyyaml
|
||||
%else
|
||||
Requires: PyYAML
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
%{?python_provide:%python_provide python3-heatclient}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-babel
|
||||
Requires: python3-cliff
|
||||
Requires: python3-iso8601
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-osc-lib >= 1.8.0
|
||||
Requires: python3-prettytable
|
||||
Requires: python3-pbr
|
||||
Requires: python3-six
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-swiftclient >= 3.2.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-PyYAML
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Heat API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-sphinxcontrib-apidoc
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-babel
|
||||
BuildRequires: python2-iso8601
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-osc-lib
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-six
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-oslo-i18n
|
||||
BuildRequires: python2-swiftclient
|
||||
BuildRequires: python2-requests
|
||||
BuildRequires: python2-cliff
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
|
||||
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
echo "%{version}" > %{buildroot}%{python3_sitelib}/heatclient/versioninfo
|
||||
mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python3_version}
|
||||
ln -s ./heat-%{python3_version} %{buildroot}%{_bindir}/heat-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/heatclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
echo "%{version}" > %{buildroot}%{python2_sitelib}/heatclient/versioninfo
|
||||
mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python2_version}
|
||||
ln -s ./heat-%{python2_version} %{buildroot}%{_bindir}/heat-2
|
||||
|
||||
ln -s ./heat-2 %{buildroot}%{_bindir}/heat
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/heat.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/heat
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/heatclient/tests
|
||||
|
||||
%if 0%{?with_doc}
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -W -b html doc/source doc/build/html
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
# generate man page
|
||||
sphinx-build -W -b man doc/source doc/build/man
|
||||
install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1
|
||||
%endif
|
||||
|
||||
# STX: stage wheels
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/heatclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/heat.1.gz
|
||||
%endif
|
||||
%{_bindir}/heat
|
||||
%{_bindir}/heat-2
|
||||
%{_bindir}/heat-%{python2_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/heat.1.gz
|
||||
%endif
|
||||
%{_bindir}/heat-3
|
||||
%{_bindir}/heat-%{python3_version}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
%endif
|
||||
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 10 2018 RDO <dev@lists.rdoproject.org> 1.16.1-1
|
||||
- Update to 1.16.1
|
||||
|
||||
|
|
@ -1,185 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname heatclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Heat API. There's a Python API (the \
|
||||
heatclient module), and a command-line script (heat). Each implements 100% of \
|
||||
the OpenStack Heat API.
|
||||
|
||||
Name: python-heatclient
|
||||
Version: 1.16.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/python-heatclient
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
%{?python_provide:%python_provide python2-heatclient}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: git
|
||||
|
||||
Requires: python2-babel
|
||||
Requires: python2-iso8601
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-osc-lib >= 1.8.0
|
||||
Requires: python2-prettytable
|
||||
Requires: python2-pbr
|
||||
Requires: python2-six
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-swiftclient >= 3.2.0
|
||||
Requires: python2-requests
|
||||
Requires: python2-cliff
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-pyyaml
|
||||
%else
|
||||
Requires: PyYAML
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Heat
|
||||
%{?python_provide:%python_provide python3-heatclient}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
|
||||
Requires: python3-babel
|
||||
Requires: python3-cliff
|
||||
Requires: python3-iso8601
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-osc-lib >= 1.8.0
|
||||
Requires: python3-prettytable
|
||||
Requires: python3-pbr
|
||||
Requires: python3-six
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-swiftclient >= 3.2.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-PyYAML
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Heat API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-babel
|
||||
BuildRequires: python2-iso8601
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-osc-lib
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-six
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-oslo-i18n
|
||||
BuildRequires: python2-swiftclient
|
||||
BuildRequires: python2-requests
|
||||
BuildRequires: python2-cliff
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
|
||||
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
echo "%{version}" > %{buildroot}%{python3_sitelib}/heatclient/versioninfo
|
||||
mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python3_version}
|
||||
ln -s ./heat-%{python3_version} %{buildroot}%{_bindir}/heat-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/heatclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
echo "%{version}" > %{buildroot}%{python2_sitelib}/heatclient/versioninfo
|
||||
mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python2_version}
|
||||
ln -s ./heat-%{python2_version} %{buildroot}%{_bindir}/heat-2
|
||||
|
||||
ln -s ./heat-2 %{buildroot}%{_bindir}/heat
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/heat.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/heat
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/heatclient/tests
|
||||
|
||||
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -W -b html doc/source doc/build/html
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
# generate man page
|
||||
sphinx-build -W -b man doc/source doc/build/man
|
||||
install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/heatclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/heat.1.gz
|
||||
%{_bindir}/heat
|
||||
%{_bindir}/heat-2
|
||||
%{_bindir}/heat-%{python2_version}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/heat.1.gz
|
||||
%{_bindir}/heat-3
|
||||
%{_bindir}/heat-%{python3_version}
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Fri Aug 10 2018 RDO <dev@lists.rdoproject.org> 1.16.1-1
|
||||
- Update to 1.16.1
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From 9ea6b1a4d02e631efccdde8ed240dc79849159af Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Wed, 27 Oct 2021 12:29:52 +0000
|
||||
Subject: [PATCH] Add wheel support
|
||||
|
||||
Add python3-heatclient-wheel package.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 17 +++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index f287c45..0598164 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -75,3 +75,20 @@ Description: client library and CLI for OpenStack Heat - Python 3.x
|
||||
the OpenStack Heat API.
|
||||
.
|
||||
This package provides the Python 3.x module.
|
||||
+
|
||||
+Package: python3-heatclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: client library and CLI for OpenStack Heat - Python 3.x
|
||||
+ Heat is a service to orchestrate multiple composite cloud applications
|
||||
+ using templates, through both an OpenStack-native ReST API and
|
||||
+ a CloudFormation-compatible Query API.
|
||||
+ .
|
||||
+ This is a client for the OpenStack Heat API. There's a Python API (the
|
||||
+ heatclient module), and a command-line script (heat). Each implements 100% of
|
||||
+ the OpenStack Heat API.
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 70f505c..110310e 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -14,7 +14,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2 --in-tmp
|
||||
+ pkgos-dh_auto_install --no-py2 --in-tmp --wheel
|
||||
|
||||
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
|
||||
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages pkgos-dh_auto_test --no-py2
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From d02fa3227bbf56e4f30d2cf3a21dd5a1d915d96a Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:51:40 +0000
|
||||
Subject: [PATCH] Remove openstackcilent
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
tool.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index f287c45..5aeee36 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -23,7 +23,6 @@ Build-Depends-Indep:
|
||||
python3-hacking,
|
||||
python3-iso8601,
|
||||
python3-keystoneauth1,
|
||||
- python3-openstackclient,
|
||||
python3-openstackdocstheme,
|
||||
python3-osc-lib,
|
||||
python3-oslo.i18n,
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0001-Add-wheel-support.patch
|
||||
remove-openstackclient.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-heatclient
|
||||
debver: 2.2.1-2
|
||||
dl_path:
|
||||
name: python-heatclient-debian-2.2.1-2.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-heatclient/-/archive/debian/2.2.1-2/python-heatclient-debian-2.2.1-2.tar.gz
|
||||
md5sum: 56685ca6ab5c8b055410d8c871a8801d
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 7b0f5e9adece320b824a97864d4566287d430e9e
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-heatclient
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME="python-ironicclient"
|
||||
SRC_DIR="$CGCS_BASE/git/python-ironicclient"
|
||||
TIS_BASE_SRCREV="3.1.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,143 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global sname ironicclient
|
||||
|
||||
%global common_desc A python and command line client library for Ironic
|
||||
|
||||
Name: python-ironicclient
|
||||
Version: 3.1.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://pypi.python.org/pypi/python-ironicclient
|
||||
Source0: https://tarballs.openstack.org/python-ironicclient/python-ironicclient-%{version}%{?milestone}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr >= 2.0.0
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
|
||||
Requires: python2-appdirs >= 1.3.0
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-pbr >= 2.0.0
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-osc-lib >= 1.10.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-oslo-config >= 5.2.0
|
||||
Requires: python2-requests
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-dogpile-cache >= 0.6.2
|
||||
Requires: python2-jsonschema
|
||||
Requires: python2-pyyaml
|
||||
%else
|
||||
Requires: python-dogpile-cache >= 0.6.2
|
||||
Requires: python-jsonschema
|
||||
Requires: PyYAML
|
||||
%endif
|
||||
|
||||
%{?python_provide:%python_provide python2-%{sname}}
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr >= 2.0.0
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
Requires: python3-appdirs >= 1.3.0
|
||||
Requires: python3-dogpile-cache >= 0.6.2
|
||||
Requires: python3-jsonschema
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-osc-lib >= 1.10.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-oslo-config >= 5.2.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-PyYAML
|
||||
|
||||
%{?python_provide:%python_provide python3-%{sname}}
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version}
|
||||
|
||||
# Remove the requirements file so that pbr hooks don't add it
|
||||
# to distutils requires_dist config
|
||||
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/ironicclient*
|
||||
%{python2_sitelib}/python_ironicclient*
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/ironicclient*
|
||||
%{python3_sitelib}/python_ironicclient*
|
||||
%endif
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 10 2018 RDO <dev@lists.rdoproject.org> 2.5.0-1
|
||||
- Update to 2.5.0
|
||||
|
||||
|
|
@ -1,138 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global sname ironicclient
|
||||
|
||||
%global common_desc A python and command line client library for Ironic
|
||||
|
||||
Name: python-ironicclient
|
||||
Version: 2.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://pypi.python.org/pypi/python-ironicclient
|
||||
Source0: https://tarballs.openstack.org/python-ironicclient/python-ironicclient-%{version}%{?milestone}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr >= 2.0.0
|
||||
BuildRequires: python2-setuptools
|
||||
|
||||
Requires: python2-appdirs >= 1.3.0
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-pbr >= 2.0.0
|
||||
Requires: python2-prettytable
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-osc-lib >= 1.10.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-requests
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-dogpile-cache >= 0.6.2
|
||||
Requires: python2-jsonschema
|
||||
Requires: python2-pyyaml
|
||||
%else
|
||||
Requires: python-dogpile-cache >= 0.6.2
|
||||
Requires: python-jsonschema
|
||||
Requires: PyYAML
|
||||
%endif
|
||||
|
||||
%{?python_provide:%python_provide python2-%{sname}}
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python client for Ironic
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr >= 2.0.0
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
Requires: python3-appdirs >= 1.3.0
|
||||
Requires: python3-dogpile-cache >= 0.6.2
|
||||
Requires: python3-jsonschema
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-prettytable
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-osc-lib >= 1.10.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-requests
|
||||
Requires: python3-PyYAML
|
||||
|
||||
%{?python_provide:%python_provide python3-%{sname}}
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version}
|
||||
|
||||
# Remove the requirements file so that pbr hooks don't add it
|
||||
# to distutils requires_dist config
|
||||
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/ironic %{buildroot}%{_bindir}/ironic-%{python3_version}
|
||||
ln -s ./ironic-%{python3_version} %{buildroot}%{_bindir}/ironic-3
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/ironic %{buildroot}%{_bindir}/ironic-%{python2_version}
|
||||
ln -s ./ironic-%{python2_version} %{buildroot}%{_bindir}/ironic-2
|
||||
|
||||
ln -s ./ironic-2 %{buildroot}%{_bindir}/ironic
|
||||
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/ironic
|
||||
%{_bindir}/ironic-2
|
||||
%{_bindir}/ironic-%{python2_version}
|
||||
%{python2_sitelib}/ironicclient*
|
||||
%{python2_sitelib}/python_ironicclient*
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/ironic-3
|
||||
%{_bindir}/ironic-%{python3_version}
|
||||
%{python3_sitelib}/ironicclient*
|
||||
%{python3_sitelib}/python_ironicclient*
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Aug 10 2018 RDO <dev@lists.rdoproject.org> 2.5.0-1
|
||||
- Update to 2.5.0
|
||||
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
From 165d7922b14a57bf5f3c3de453c1ebf21f2995ef Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Wed, 27 Oct 2021 12:49:17 +0000
|
||||
Subject: [PATCH] Add wheel package
|
||||
|
||||
Add python3-ironicclient-wheel package
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 23 +++++++++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index f837496..9dedef0 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -100,3 +100,26 @@ Description: Client for OpenStack bare metal Service - Python 3.x
|
||||
interact with Ironic's API.
|
||||
.
|
||||
This package provides the Python 3.x support.
|
||||
+
|
||||
+Package: python3-ironicclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: Client for OpenStack bare metal Service - Python 3.x
|
||||
+ Ironic provision bare metal machines instead of virtual machines. It is a fork
|
||||
+ of the Nova Baremetal driver. It is best thought of as a bare metal hypervisor
|
||||
+ API and a set of plugins which interact with the bare metal hypervisors. By
|
||||
+ default, it will use PXE and IPMI in concert to provision and turn on/off
|
||||
+ machines, but Ironic also supports vendor-specific plugins which may
|
||||
+ implement
|
||||
+ additional functionality.
|
||||
+ .
|
||||
+ This is a client for the OpenStack Ironic API. There's a Python API
|
||||
+ (the "ironicclient" module), and a command-line script ("ironic").
|
||||
+ .
|
||||
+ Installing this package gets you a shell command, that you can use to
|
||||
+ interact with Ironic's API.
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index e69b6fe..40f2b34 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -12,7 +12,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 26c374cef18537b8c2bd045838f5a4940f43323c Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:52:34 +0000
|
||||
Subject: [PATCH] Remove openstackclient
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
tool.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 8de0e3e..08a8fe1 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -22,7 +22,6 @@ Build-Depends-Indep:
|
||||
python3-fixtures,
|
||||
python3-jsonschema (>= 3.2.0),
|
||||
python3-keystoneauth1,
|
||||
- python3-openstackclient,
|
||||
python3-openstackdocstheme,
|
||||
python3-openstacksdk (>= 0.18.0),
|
||||
python3-osc-lib,
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0001-Add-wheel-package.patch
|
||||
remove-openstackclient.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-ironicclient
|
||||
debver: 4.4.0-1
|
||||
dl_path:
|
||||
name: python-ironicclient-debian-4.4.0-1.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-ironicclient/-/archive/debian/4.4.0-1/python-ironicclient-debian-4.4.0-1.tar.gz
|
||||
md5sum: aad755aa1e4e5942d6fc70b1370cda65
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 0b413bf7bc9c143111d751f4b050c9f04d4fbf59
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-ironicclient
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
TIS_PATCH_VER=PKG_GITREVCOUNT
|
||||
COPY_LIST="$FILES_BASE/*"
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
#!/bin/sh
|
||||
# Copyright (c) 2013-2021 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: OpenStack Keystone-wsgi
|
||||
# Required-Start: networking
|
||||
# Required-Stop: networking
|
||||
# Default-Start: 2 3 4 5
|
||||
# Default-Stop: 0 1 6
|
||||
# Short-Description: OpenStack Keystone
|
||||
# Description: Openstack Identitiy service running on WSGI compatable gunicorn web server
|
||||
#
|
||||
### END INIT INFO
|
||||
|
||||
RETVAL=0
|
||||
#public 5000
|
||||
|
||||
DESC_PUBLIC="openstack-keystone"
|
||||
|
||||
PIDFILE_PUBLIC="/var/run/$DESC_PUBLIC.pid"
|
||||
|
||||
PYTHON=`which python`
|
||||
|
||||
source /etc/keystone/keystone-extra.conf
|
||||
source /etc/platform/platform.conf
|
||||
|
||||
if [ -n ${@:2:1} ] ; then
|
||||
if [ ${@:2:1}="--public-bind-addr" ] ; then
|
||||
PUBLIC_BIND_ADDR_CMD=${@:3:1}
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
###
|
||||
EXEC="/usr/bin/gunicorn"
|
||||
|
||||
WORKER="eventlet"
|
||||
# Increased timeout to facilitate large image uploads
|
||||
TIMEOUT="200"
|
||||
|
||||
TIS_WORKERS=${TIS_PUBLIC_WORKERS%.*}
|
||||
|
||||
#--max-requests , --max-requests-jitter Configuration
|
||||
#--max-requests = The max number of requests a worker will process before restarting
|
||||
#--max-requests-jitter = The maximum jitter to add to the max_requests setting.
|
||||
MAX_REQUESTS=100000
|
||||
MAX_REQ_JITTER_CAP_FACTOR=0.5
|
||||
MAX_REQ_JITTER_PUBLIC=$(echo "${TIS_WORKERS}*${MAX_REQ_JITTER_CAP_FACTOR}+1"|bc)
|
||||
MAX_REQ_JITTER_PUBLIC=${MAX_REQ_JITTER_PUBLIC%.*}
|
||||
|
||||
|
||||
start()
|
||||
{
|
||||
# Got proper no of workers . Starting gunicorn now
|
||||
echo -e "Initialising keystone service using gunicorn .. \n"
|
||||
|
||||
if [ -z "$PUBLIC_BIND_ADDR" ]; then
|
||||
echo "Keystone floating ip not found . Cannot start services. Exiting .."
|
||||
exit 1
|
||||
fi
|
||||
BIND_PUBLIC=$PUBLIC_BIND_ADDR:5000
|
||||
|
||||
if [ -e $PIDFILE_PUBLIC ]; then
|
||||
PIDDIR=/proc/$(cat $PIDFILE_PUBLIC)
|
||||
if [ -d ${PIDDIR} ]; then
|
||||
echo "$DESC_PUBLIC already running."
|
||||
exit 1
|
||||
else
|
||||
echo "Removing stale PID file $PIDFILE_PUBLIC"
|
||||
rm -f $PIDFILE_PUBLIC
|
||||
fi
|
||||
fi
|
||||
|
||||
echo -e "Starting $DESC_PUBLIC...\n";
|
||||
echo -e "Worker is ${WORKER} --workers ${TIS_WORKERS} --timeout ${TIMEOUT} --max_requests ${MAX_REQUESTS} --max_request_jitter public ${MAX_REQ_JITTER_PUBLIC}\n" ;
|
||||
|
||||
echo -e "Starting keystone process at port 5000 \n" ;
|
||||
|
||||
start-stop-daemon --start --quiet --background --pidfile ${PIDFILE_PUBLIC} \
|
||||
--make-pidfile --exec ${PYTHON} -- ${EXEC} --bind ${BIND_PUBLIC} \
|
||||
--worker-class ${WORKER} --workers ${TIS_WORKERS} --timeout ${TIMEOUT} \
|
||||
--max-requests ${MAX_REQUESTS} --max-requests-jitter ${MAX_REQ_JITTER_PUBLIC} \
|
||||
--log-syslog \
|
||||
--pythonpath '/usr/share/keystone' public:application --name keystone-public
|
||||
|
||||
RETVAL=$?
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
echo -e "Keystone started at port 5000... \n"
|
||||
else
|
||||
echo -e "Failed to start Keystone .. \n"
|
||||
fi
|
||||
}
|
||||
|
||||
stop()
|
||||
{
|
||||
if [ -e $PIDFILE_PUBLIC ]; then
|
||||
start-stop-daemon --stop --quiet --pidfile $PIDFILE_PUBLIC
|
||||
RETVAL_PUBLIC=$?
|
||||
if [ $RETVAL_PUBLIC -eq 0 ]; then
|
||||
echo "Stopped $DESC_PUBLIC."
|
||||
else
|
||||
echo "Stopping failed - $PIDFILE_PUBLIC"
|
||||
fi
|
||||
rm -f $PIDFILE_PUBLIC
|
||||
else
|
||||
echo "Already stopped - $PIDFILE_PUBLIC"
|
||||
fi
|
||||
}
|
||||
|
||||
status()
|
||||
{
|
||||
pid_public=`cat $PIDFILE_PUBLIC 2>/dev/null`
|
||||
|
||||
if [ -n "$pid_public" ]; then
|
||||
echo -e "\033[32m $DESC_PUBLIC is running..\033[0m"
|
||||
else
|
||||
echo -e "\033[31m $DESC_PUBLIC is not running..\033[0m"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|force-reload|reload)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
status)
|
||||
status
|
||||
;;
|
||||
*)
|
||||
#echo "Usage: $0 {start|stop|force-reload|restart|reload|status} OR {/usr/bin/keystone-all start --public-bind-addr xxx.xxx.xxx}"
|
||||
start
|
||||
#RETVAL=1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
#
|
||||
# Wrapper script to rotate keystone fernet keys on active controller only
|
||||
#
|
||||
KEYSTONE_KEYS_ROTATE_INFO="/var/run/keystone-keys-rotate.info"
|
||||
KEYSTONE_KEYS_ROTATE_CMD="/usr/bin/nice -n 2 /usr/bin/keystone-manage fernet_rotate --keystone-user keystone --keystone-group keystone"
|
||||
|
||||
function is_active_pgserver()
|
||||
{
|
||||
# Determine whether we're running on the same controller as the service.
|
||||
local service=postgres
|
||||
local enabledactive=$(/usr/bin/sm-query service $service| grep enabled-active)
|
||||
if [ "x$enabledactive" == "x" ]
|
||||
then
|
||||
# enabled-active not found for that service on this controller
|
||||
return 1
|
||||
else
|
||||
# enabled-active found for that resource
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
if is_active_pgserver
|
||||
then
|
||||
if [ ! -f ${KEYSTONE_KEYS_ROTATE_INFO} ]
|
||||
then
|
||||
echo delay_count=0 > ${KEYSTONE_KEYS_ROTATE_INFO}
|
||||
fi
|
||||
|
||||
source ${KEYSTONE_KEYS_ROTATE_INFO}
|
||||
sudo -u postgres psql -d fm -c "SELECT alarm_id, entity_instance_id from alarm;" | grep -P "^(?=.*100.101)(?=.*${HOSTNAME})" &>/dev/null
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
source /etc/platform/platform.conf
|
||||
if [ "${system_type}" = "All-in-one" ]
|
||||
then
|
||||
source /etc/init.d/task_affinity_functions.sh
|
||||
idle_core=$(get_most_idle_core)
|
||||
if [ "$idle_core" -ne "0" ]
|
||||
then
|
||||
sh -c "exec taskset -c $idle_core ${KEYSTONE_KEYS_ROTATE_CMD}"
|
||||
sed -i "/delay_count/s/=.*/=0/" ${KEYSTONE_KEYS_ROTATE_INFO}
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$delay_count" -lt "3" ]
|
||||
then
|
||||
newval=$(($delay_count+1))
|
||||
sed -i "/delay_count/s/=.*/=$newval/" ${KEYSTONE_KEYS_ROTATE_INFO}
|
||||
(sleep 3600; /usr/bin/keystone-fernet-keys-rotate-active) &
|
||||
exit 0
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
eval ${KEYSTONE_KEYS_ROTATE_CMD}
|
||||
sed -i "/delay_count/s/=.*/=0/" ${KEYSTONE_KEYS_ROTATE_INFO}
|
||||
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
[Unit]
|
||||
Description=OpenStack Identity Service (code-named Keystone)
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
#ReminAfterExit is set to yes as we have 2 pids to monitor
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/bin/keystone-all start
|
||||
ExecStop=/usr/bin/keystone-all stop
|
||||
ExecReload=/usr/bin/keystone-all reload
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
# The password rules captures the [security_compliance]
|
||||
# section of the generic Keystone configuration (keystone.conf)
|
||||
# This configuration is used to statically define the password
|
||||
# rules for password validation in pre-Keystone environments
|
||||
#
|
||||
# N.B: Only set non-default keys here (default commented configuration
|
||||
# items not needed)
|
||||
|
||||
[security_compliance]
|
||||
|
||||
#
|
||||
# From keystone
|
||||
#
|
||||
|
||||
# This controls the number of previous user password iterations to keep in
|
||||
# history, in order to enforce that newly created passwords are unique. Setting
|
||||
# the value to one (the default) disables this feature. Thus, to enable this
|
||||
# feature, values must be greater than 1. This feature depends on the `sql`
|
||||
# backend for the `[identity] driver`. (integer value)
|
||||
# Minimum value: 1
|
||||
unique_last_password_count = 3
|
||||
|
||||
# The regular expression used to validate password strength requirements. By
|
||||
# default, the regular expression will match any password. The following is an
|
||||
# example of a pattern which requires at least 1 letter, 1 digit, and have a
|
||||
# minimum length of 7 characters: ^(?=.*\d)(?=.*[a-zA-Z]).{7,}$ This feature
|
||||
# depends on the `sql` backend for the `[identity] driver`. (string value)
|
||||
password_regex = ^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*()<>{}+=_\\\[\]\-?|~`,.;:]).{7,}$
|
||||
|
||||
# Describe your password regular expression here in language for humans. If a
|
||||
# password fails to match the regular expression, the contents of this
|
||||
# configuration variable will be returned to users to explain why their
|
||||
# requested password was insufficient. (string value)
|
||||
password_regex_description = Password must have a minimum length of 7 characters, and must contain at least 1 upper case, 1 lower case, 1 digit, and 1 special character
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# Copyright (c) 2013-2017 Wind River Systems, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import sys
|
||||
|
||||
from keystone.server import wsgi as wsgi_server
|
||||
|
||||
|
||||
sys.argv = sys.argv[:1]
|
||||
|
||||
application = wsgi_server.initialize_public_application()
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 7feac57d571e49e042adb96738a3688c56adade0 Mon Sep 17 00:00:00 2001
|
||||
From: Tyler Smith <tyler.smith@windriver.com>
|
||||
Date: Mon, 8 Apr 2019 15:33:16 -0400
|
||||
Subject: [PATCH 1/1] Add keyring patch
|
||||
|
||||
---
|
||||
SPECS/openstack-keystone.spec | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec
|
||||
index d3ec1d7..3d5fcee 100644
|
||||
--- a/SPECS/openstack-keystone.spec
|
||||
+++ b/SPECS/openstack-keystone.spec
|
||||
@@ -27,7 +27,7 @@ Name: openstack-keystone
|
||||
# https://review.openstack.org/#/q/I6a35fa0dda798fad93b804d00a46af80f08d475c,n,z
|
||||
Epoch: 1
|
||||
Version: 16.0.0
|
||||
-Release: 1%{?dist}
|
||||
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: OpenStack Identity Service
|
||||
License: ASL 2.0
|
||||
URL: http://keystone.openstack.org/
|
||||
@@ -39,6 +39,9 @@ Source3: openstack-keystone.sysctl
|
||||
Source5: openstack-keystone-sample-data
|
||||
Source20: keystone-dist.conf
|
||||
|
||||
+# STX: Include patches here
|
||||
+Patch1: 0001-Rebasing-Keyring-integration.patch
|
||||
+
|
||||
BuildArch: noarch
|
||||
BuildRequires: openstack-macros
|
||||
BuildRequires: python%{pyver}-devel
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
Add-keyring-patch.patch
|
||||
Update-spec-with-tis-additions.patch
|
||||
|
|
@ -1,133 +0,0 @@
|
|||
From 7afb60e6591d9d1e6d6374a85cf516182b660815 Mon Sep 17 00:00:00 2001
|
||||
From: Tyler Smith <tyler.smith@windriver.com>
|
||||
Date: Mon, 8 Apr 2019 15:40:07 -0400
|
||||
Subject: [PATCH 1/1] Update-spec-with-tis-additions
|
||||
|
||||
---
|
||||
SPECS/openstack-keystone.spec | 50 +++++++++++++++++++++++++++++++++++++------
|
||||
1 file changed, 43 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/SPECS/openstack-keystone.spec b/SPECS/openstack-keystone.spec
|
||||
index 3d5fcee..97c0586 100644
|
||||
--- a/SPECS/openstack-keystone.spec
|
||||
+++ b/SPECS/openstack-keystone.spec
|
||||
@@ -11,7 +11,8 @@
|
||||
%global pyver_build %py%{pyver}_build
|
||||
# End of macros for py2/py3 compatibility
|
||||
|
||||
-%global with_doc 1
|
||||
+#STX: Turn off doc building
|
||||
+%global with_doc 0
|
||||
%global service keystone
|
||||
# guard for package OSP does not support
|
||||
%global rhosp 0
|
||||
@@ -39,6 +40,13 @@ Source3: openstack-keystone.sysctl
|
||||
Source5: openstack-keystone-sample-data
|
||||
Source20: keystone-dist.conf
|
||||
|
||||
+#STX
|
||||
+Source99: openstack-keystone.service
|
||||
+Source100: keystone-all
|
||||
+Source101: keystone-fernet-keys-rotate-active
|
||||
+Source102: password-rules.conf
|
||||
+Source103: public.py
|
||||
+
|
||||
# STX: Include patches here
|
||||
Patch1: 0001-Rebasing-Keyring-integration.patch
|
||||
|
||||
@@ -233,9 +241,9 @@ sed -i 's#/local/bin#/bin#' httpd/wsgi-keystone.conf
|
||||
sed -i 's#apache2#httpd#' httpd/wsgi-keystone.conf
|
||||
|
||||
%build
|
||||
-PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keystone.conf
|
||||
-PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keystone.conf --format yaml --output-file=%{service}-schema.yaml
|
||||
-PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keystone.conf --format json --output-file=%{service}-schema.json
|
||||
+PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf
|
||||
+PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf --format yaml --output-file=%{service}-schema.yaml
|
||||
+PYTHONPATH=. oslo-config-generator --config-file=config-generator/keystone.conf --format json --output-file=%{service}-schema.json
|
||||
# distribution defaults are located in keystone-dist.conf
|
||||
|
||||
%{pyver_build}
|
||||
@@ -250,6 +258,8 @@ PYTHONPATH=. oslo-config-generator-%{pyver} --config-file=config-generator/keyst
|
||||
# Instead, ship an empty file that operators can override.
|
||||
echo "{}" > policy.json
|
||||
|
||||
+# STX: default dir for fernet tokens
|
||||
+install -d -m 750 %{buildroot}%{_sysconfdir}/keystone/credential-keys/
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/keystone
|
||||
install -p -D -m 640 etc/keystone.conf.sample %{buildroot}%{_sysconfdir}/keystone/keystone.conf
|
||||
install -p -D -m 640 policy.json %{buildroot}%{_sysconfdir}/keystone/policy.json
|
||||
@@ -259,7 +269,8 @@ install -p -D -m 644 %{SOURCE20} %{buildroot}%{_datadir}/keystone/keystone-dist.
|
||||
install -p -D -m 640 etc/logging.conf.sample %{buildroot}%{_sysconfdir}/keystone/logging.conf
|
||||
install -p -D -m 640 etc/default_catalog.templates %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates
|
||||
install -p -D -m 640 etc/sso_callback_template.html %{buildroot}%{_sysconfdir}/keystone/sso_callback_template.html
|
||||
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
|
||||
+# STX: don't install a separate keystone logrotate file as this is managed by syslog-ng
|
||||
+#install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
|
||||
install -d -m 755 %{buildroot}%{_prefix}/lib/sysctl.d
|
||||
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_prefix}/lib/sysctl.d/openstack-keystone.conf
|
||||
# Install sample data script.
|
||||
@@ -268,6 +279,21 @@ install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample
|
||||
# Install sample HTTPD integration files
|
||||
install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/
|
||||
|
||||
+# STX install keystone cron script
|
||||
+install -p -D -m 755 %{SOURCE101} %{buildroot}%{_bindir}/keystone-fernet-keys-rotate-active
|
||||
+
|
||||
+# STX: install password rules(readable only)
|
||||
+install -p -D -m 440 %{SOURCE102} %{buildroot}%{_sysconfdir}/keystone/password-rules.conf
|
||||
+
|
||||
+# STX: install keystone public gunicorn app
|
||||
+install -p -D -m 755 %{SOURCE103} %{buildroot}/%{_datarootdir}/keystone/public.py
|
||||
+
|
||||
+# STX: install openstack-keystone service script
|
||||
+install -p -D -m 644 %{SOURCE99} %{buildroot}%{_unitdir}/openstack-keystone.service
|
||||
+
|
||||
+# STX: Install keystone-all bash script
|
||||
+install -p -D -m 755 %{SOURCE100} %{buildroot}%{_bindir}/keystone-all
|
||||
+
|
||||
install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
|
||||
install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone
|
||||
|
||||
@@ -325,26 +351,36 @@ chmod 660 %{_localstatedir}/log/keystone/keystone.log
|
||||
%{_bindir}/keystone-manage
|
||||
%{_bindir}/keystone-status
|
||||
%{_bindir}/openstack-keystone-sample-data
|
||||
+# STX: add keystone-all
|
||||
+%{_bindir}/keystone-all
|
||||
+# STX: add Keystone fernet keys cron job
|
||||
+%{_bindir}/keystone-fernet-keys-rotate-active
|
||||
%dir %{_datadir}/keystone
|
||||
%attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist.conf
|
||||
%attr(0644, root, keystone) %{_datadir}/keystone/%{service}-schema.yaml
|
||||
%attr(0644, root, keystone) %{_datadir}/keystone/%{service}-schema.json
|
||||
%attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
|
||||
%attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
|
||||
+# STX: add openstack-keystone sysinit script
|
||||
+%{_unitdir}/openstack-keystone.service
|
||||
%dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/keystone.conf
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/logging.conf
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/policy.json
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
|
||||
%config(noreplace) %attr(0640, keystone, keystone) %{_sysconfdir}/keystone/sso_callback_template.html
|
||||
-%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
|
||||
+# STX: log rotate not needed
|
||||
+#%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
|
||||
%dir %attr(-, keystone, keystone) %{_sharedstatedir}/keystone
|
||||
%dir %attr(0750, keystone, keystone) %{_localstatedir}/log/keystone
|
||||
%ghost %attr(0660, root, keystone) %{_localstatedir}/log/keystone/keystone.log
|
||||
%{_prefix}/lib/sysctl.d/openstack-keystone.conf
|
||||
-
|
||||
+# STX: add password rules configuration
|
||||
+%attr(0440, root, keystone) %{_sysconfdir}/keystone/password-rules.conf
|
||||
|
||||
%files -n python%{pyver}-keystone -f %{service}.lang
|
||||
+# STX: public.py addition
|
||||
+%{_datarootdir}/keystone/public*.py*
|
||||
%defattr(-,root,root,-)
|
||||
%license LICENSE
|
||||
%{pyver_sitelib}/keystone
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1,147 +0,0 @@
|
|||
From dfe0978f6590818487bb9fc5e9b8156e77a25590 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Mon, 8 Apr 2019 15:25:28 -0400
|
||||
Subject: [PATCH 1/1] Rebasing Keyring integration
|
||||
|
||||
---
|
||||
keystone/exception.py | 6 ++++++
|
||||
keystone/identity/core.py | 54 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
requirements.txt | 1 +
|
||||
3 files changed, 61 insertions(+)
|
||||
|
||||
diff --git a/keystone/exception.py b/keystone/exception.py
|
||||
index b85878b..56601ce 100644
|
||||
--- a/keystone/exception.py
|
||||
+++ b/keystone/exception.py
|
||||
@@ -224,6 +224,12 @@ class ApplicationCredentialLimitExceeded(ForbiddenNotSecurity):
|
||||
"maximum of %(limit)d already exceeded for user.")
|
||||
|
||||
|
||||
+class WRSForbiddenAction(Error):
|
||||
+ message_format = _("That action is not permitted")
|
||||
+ code = 403
|
||||
+ title = 'Forbidden'
|
||||
+
|
||||
+
|
||||
class SecurityError(Error):
|
||||
"""Security error exception.
|
||||
|
||||
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
|
||||
index ed43e76..da7e7ba 100644
|
||||
--- a/keystone/identity/core.py
|
||||
+++ b/keystone/identity/core.py
|
||||
@@ -17,6 +17,7 @@
|
||||
import copy
|
||||
import functools
|
||||
import itertools
|
||||
+import keyring
|
||||
import operator
|
||||
import os
|
||||
import threading
|
||||
@@ -54,6 +55,7 @@ MEMOIZE_ID_MAPPING = cache.get_memoization_decorator(group='identity',
|
||||
|
||||
DOMAIN_CONF_FHEAD = 'keystone.'
|
||||
DOMAIN_CONF_FTAIL = '.conf'
|
||||
+KEYRING_CGCS_SERVICE = "CGCS"
|
||||
|
||||
# The number of times we will attempt to register a domain to use the SQL
|
||||
# driver, if we find that another process is in the middle of registering or
|
||||
@@ -1069,6 +1071,26 @@ class Manager(manager.Manager):
|
||||
if new_ref['domain_id'] != orig_ref['domain_id']:
|
||||
raise exception.ValidationError(_('Cannot change Domain ID'))
|
||||
|
||||
+ def _update_keyring_password(self, user, new_password):
|
||||
+ """Update user password in Keyring backend.
|
||||
+ This method Looks up user entries in Keyring backend
|
||||
+ and accordingly update the corresponding user password.
|
||||
+ :param user : keyring user struct
|
||||
+ :param new_password : new password to set
|
||||
+ """
|
||||
+ if (new_password is not None) and ('name' in user):
|
||||
+ try:
|
||||
+ # only update if an entry exists
|
||||
+ if (keyring.get_password(KEYRING_CGCS_SERVICE, user['name'])):
|
||||
+ keyring.set_password(KEYRING_CGCS_SERVICE,
|
||||
+ user['name'], new_password)
|
||||
+ except (keyring.errors.PasswordSetError, RuntimeError):
|
||||
+ msg = ('Failed to Update Keyring Password for the user %s')
|
||||
+ LOG.warning(msg, user['name'])
|
||||
+ # only raise an exception if this is the admin user
|
||||
+ if (user['name'] == 'admin'):
|
||||
+ raise exception.WRSForbiddenAction(msg % user['name'])
|
||||
+
|
||||
@domains_configured
|
||||
@exception_translated('user')
|
||||
def update_user(self, user_id, user_ref, initiator=None):
|
||||
@@ -1099,6 +1121,17 @@ class Manager(manager.Manager):
|
||||
|
||||
ref = driver.update_user(entity_id, user)
|
||||
|
||||
+ # Certain local Keystone users are stored in Keystone as opposed
|
||||
+ # to the default SQL Identity backend, such as the admin user.
|
||||
+ # When its password is updated, we need to update Keyring as well
|
||||
+ # as certain services retrieve this user context from Keyring and
|
||||
+ # will get auth failures
|
||||
+ # Need update password before send out notification. Otherwise,
|
||||
+ # any process monitor the notification will still get old password
|
||||
+ # from Keyring.
|
||||
+ if ('password' in user) and ('name' in ref):
|
||||
+ self._update_keyring_password(ref, user['password'])
|
||||
+
|
||||
notifications.Audit.updated(self._USER, user_id, initiator)
|
||||
|
||||
enabled_change = ((user.get('enabled') is False) and
|
||||
@@ -1128,6 +1161,7 @@ class Manager(manager.Manager):
|
||||
hints.add_filter('user_id', user_id)
|
||||
fed_users = PROVIDERS.shadow_users_api.list_federated_users_info(hints)
|
||||
|
||||
+ username = user_old.get('name', "")
|
||||
driver.delete_user(entity_id)
|
||||
PROVIDERS.assignment_api.delete_user_assignments(user_id)
|
||||
self.get_user.invalidate(self, user_id)
|
||||
@@ -1141,6 +1175,18 @@ class Manager(manager.Manager):
|
||||
|
||||
PROVIDERS.credential_api.delete_credentials_for_user(user_id)
|
||||
PROVIDERS.id_mapping_api.delete_id_mapping(user_id)
|
||||
+
|
||||
+ # Delete the keyring entry associated with this user (if present)
|
||||
+ try:
|
||||
+ keyring.delete_password(KEYRING_CGCS_SERVICE, username)
|
||||
+ except keyring.errors.PasswordDeleteError:
|
||||
+ LOG.warning(('delete_user: PasswordDeleteError for %s'),
|
||||
+ username)
|
||||
+ pass
|
||||
+ except exception.UserNotFound:
|
||||
+ LOG.warning(('delete_user: UserNotFound for %s'),
|
||||
+ username)
|
||||
+ pass
|
||||
notifications.Audit.deleted(self._USER, user_id, initiator)
|
||||
|
||||
# Invalidate user role assignments cache region, as it may be caching
|
||||
@@ -1390,6 +1436,14 @@ class Manager(manager.Manager):
|
||||
notifications.Audit.updated(self._USER, user_id, initiator)
|
||||
self._persist_revocation_event_for_user(user_id)
|
||||
|
||||
+ user = self.get_user(user_id)
|
||||
+ # Update Keyring password for the 'user' if it
|
||||
+ # has an entry in Keyring
|
||||
+ if (original_password) and ('name' in user):
|
||||
+ # Change the 'user' password in keyring, provided the user
|
||||
+ # has an entry in Keyring backend
|
||||
+ self._update_keyring_password(user, new_password)
|
||||
+
|
||||
@MEMOIZE
|
||||
def _shadow_nonlocal_user(self, user):
|
||||
try:
|
||||
diff --git a/requirements.txt b/requirements.txt
|
||||
index e3de1c6..e6d3536 100644
|
||||
--- a/requirements.txt
|
||||
+++ b/requirements.txt
|
||||
@@ -42,3 +42,4 @@ pycadf!=2.0.0,>=1.1.0 # Apache-2.0
|
||||
msgpack>=0.5.0 # Apache-2.0
|
||||
osprofiler>=1.4.0 # Apache-2.0
|
||||
pytz>=2013.6 # MIT
|
||||
+keyring>=5.3
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
mirror:Source/openstack-keystone-16.0.0-1.el7.src.rpm
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-keystone
|
||||
PROJECT=keystone
|
||||
PROJECT_REPO=https://opendev.org/openstack/keystone.git
|
||||
PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
|
||||
PROFILES="fluent apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-keystone
|
||||
PROJECT=keystone
|
||||
PROJECT_REPO=https://opendev.org/openstack/keystone.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
|
||||
PROFILES="fluent apache"
|
||||
CUSTOMIZATION="\
|
||||
sudo cp /opt/rh/httpd24/root/etc/httpd/conf.modules.d/10-rh-python36-wsgi.conf /etc/httpd/conf.modules.d/10-wsgi.conf && \
|
||||
sudo cp /opt/rh/httpd24/root/usr/lib64/httpd/modules/mod_rh-python36-wsgi.so /etc/httpd/modules/ \
|
||||
"
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-keystone
|
||||
PROJECT=keystone
|
||||
PROJECT_REPO=https://opendev.org/openstack/keystone.git
|
||||
PROJECT_REF=1ab860a08e527ca9e0c82a49fbf004d415fec991
|
||||
PIP_PACKAGES="python-openstackclient ldap ldappool python-ldap pylint"
|
||||
DIST_REPOS="OS"
|
||||
PROFILES="fluent apache"
|
||||
CUSTOMIZATION="\
|
||||
ln -s /etc/apache2/mods-available/wsgi.load /etc/apache2/mods-enabled/wsgi.load && \
|
||||
ln -s /etc/apache2/mods-available/wsgi.conf /etc/apache2/mods-enabled/wsgi.conf && \
|
||||
sed -i \"s/getattr(base64, 'decodebytes', base64.decodestring)/getattr(base64, 'decodebytes')/g\" /var/lib/openstack/lib/python3.9/site-packages/saml2/saml.py && \
|
||||
sed -i \"s/getattr(base64, 'encodebytes', base64.encodestring)/getattr(base64, 'encodebytes')/g\" /var/lib/openstack/lib/python3.9/site-packages/saml2/saml.py
|
||||
"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-neutron
|
||||
PROJECT=neutron
|
||||
PROJECT_REPO=https://opendev.org/openstack/neutron.git
|
||||
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
||||
DIST_PACKAGES="ethtool lshw"
|
||||
PROFILES="fluent neutron linuxbridge openvswitch"
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-neutron
|
||||
PROJECT=neutron
|
||||
PROJECT_REPO=https://opendev.org/openstack/neutron.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
||||
DIST_PACKAGES="ethtool lshw"
|
||||
PROFILES="fluent neutron linuxbridge openvswitch"
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-neutron
|
||||
PROJECT=neutron
|
||||
DIST_REPOS="OS"
|
||||
PROJECT_REPO=https://opendev.org/openstack/neutron.git
|
||||
PROJECT_REF=fe2445d99c430bb080ac45a19e4958b1ae7c9857
|
||||
UPDATE_SYSTEM_ACCOUNT="yes"
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
|
||||
DIST_PACKAGES="ethtool lshw"
|
||||
PROFILES="fluent neutron linuxbridge openvswitch"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=python-neutronclient
|
||||
SRC_DIR="$CGCS_BASE/git/python-neutronclient"
|
||||
TIS_BASE_SRCREV="6.14.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,255 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname neutronclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
Client library and command line utility for interacting with OpenStack \
|
||||
Neutron's API.
|
||||
|
||||
Name: python-neutronclient
|
||||
Version: 6.14.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
|
||||
License: ASL 2.0
|
||||
URL: http://launchpad.net/%{name}/
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Obsoletes: python-%{sname}-tests <= 4.1.1-3
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
%{?python_provide:%python_provide python2-neutronclient}
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-pbr
|
||||
# Required for unit tests
|
||||
BuildRequires: python2-osc-lib-tests
|
||||
BuildRequires: python2-oslotest
|
||||
BuildRequires: python2-testtools
|
||||
BuildRequires: python2-testrepository
|
||||
BuildRequires: python2-testscenarios
|
||||
BuildRequires: python2-oslo-log >= 3.36.0
|
||||
|
||||
Requires: python2-babel >= 2.3.4
|
||||
Requires: python2-iso8601 >= 0.1.11
|
||||
Requires: python2-os-client-config >= 1.28.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-log >= 3.36.0
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr
|
||||
Requires: python2-requests >= 2.14.2
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-debtcollector >= 1.2.0
|
||||
Requires: python2-osc-lib >= 1.10.0
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-keystoneclient >= 1:3.8.0
|
||||
Requires: python2-cliff >= 2.8.0
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-netaddr >= 0.7.18
|
||||
Requires: python2-simplejson >= 3.5.1
|
||||
%else
|
||||
Requires: python-netaddr >= 0.7.18
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}-tests
|
||||
Summary: Python API and CLI for OpenStack Neutron - Unit tests
|
||||
%{?python_provide:%python_provide python2-%{sname}-tests}
|
||||
Requires: python2-%{sname} == %{version}-%{release}
|
||||
Requires: python2-osc-lib-tests
|
||||
Requires: python2-oslotest
|
||||
Requires: python2-testtools
|
||||
Requires: python2-testrepository
|
||||
Requires: python2-testscenarios
|
||||
|
||||
%description -n python2-%{sname}-tests
|
||||
%{common_desc}
|
||||
|
||||
This package containts the unit tests.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
%{?python_provide:%python_provide python3-neutronclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
# Required for unit tests
|
||||
BuildRequires: python3-osc-lib-tests
|
||||
BuildRequires: python3-oslotest
|
||||
BuildRequires: python3-testrepository
|
||||
BuildRequires: python3-testtools
|
||||
BuildRequires: python3-testscenarios
|
||||
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-cliff >= 2.8.0
|
||||
Requires: python3-iso8601 >= 0.1.11
|
||||
Requires: python3-netaddr >= 0.7.18
|
||||
Requires: python3-os-client-config >= 1.28.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-log >= 3.36.0
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-requests >= 2.14.2
|
||||
Requires: python3-simplejson >= 3.5.1
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-debtcollector >= 1.2.0
|
||||
Requires: python3-osc-lib >= 1.10.0
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-keystoneclient >= 1:3.8.0
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python3-%{sname}-tests
|
||||
Summary: Python API and CLI for OpenStack Neutron - Unit tests
|
||||
%{?python_provide:%python_provide python3-%{sname}-tests}
|
||||
Requires: python3-%{sname} == %{version}-%{release}
|
||||
Requires: python3-osc-lib-tests
|
||||
Requires: python3-oslotest
|
||||
Requires: python3-testrepository
|
||||
Requires: python3-testtools
|
||||
Requires: python3-testscenarios
|
||||
|
||||
%description -n python3-%{sname}-tests
|
||||
%{common_desc}
|
||||
|
||||
This package containts the unit tests.
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Neutron API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-reno
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-keystoneclient
|
||||
BuildRequires: python2-os-client-config
|
||||
BuildRequires: python2-osc-lib >= 1.10.0
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-cliff
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the dependencies
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
# Build HTML docs
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/neutron %{buildroot}%{_bindir}/neutron-%{python3_version}
|
||||
ln -s ./neutron-%{python3_version} %{buildroot}%{_bindir}/neutron-3
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/neutron %{buildroot}%{_bindir}/neutron-%{python2_version}
|
||||
ln -s ./neutron-%{python2_version} %{buildroot}%{_bindir}/neutron-2
|
||||
ln -s ./neutron-2 %{buildroot}%{_bindir}/neutron
|
||||
|
||||
# STX: stage wheel files
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
%check
|
||||
# (TODO) Ignore unit tests results until https://bugs.launchpad.net/python-neutronclient/+bug/1783789
|
||||
# is fixed.
|
||||
%{__python2} setup.py testr || true
|
||||
%if 0%{?with_python3}
|
||||
rm -rf .testrepository
|
||||
%{__python3} setup.py testr || true
|
||||
%endif
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/neutronclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_bindir}/neutron
|
||||
%{_bindir}/neutron-2
|
||||
%{_bindir}/neutron-%{python2_version}
|
||||
%exclude %{python2_sitelib}/neutronclient/tests
|
||||
|
||||
%files -n python2-%{sname}-tests
|
||||
%{python2_sitelib}/neutronclient/tests
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_bindir}/neutron-3
|
||||
%{_bindir}/neutron-%{python3_version}
|
||||
%exclude %{python3_sitelib}/neutronclient/tests
|
||||
|
||||
%files -n python3-%{sname}-tests
|
||||
%{python3_sitelib}/neutronclient/tests
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 20 2018 RDO <dev@lists.rdoproject.org> 6.9.1-1
|
||||
- Update to 6.9.1
|
||||
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 6.9.0-1
|
||||
- Update to 6.9.0
|
||||
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname neutronclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
Client library and command line utility for interacting with OpenStack \
|
||||
Neutron's API.
|
||||
|
||||
Name: python-neutronclient
|
||||
Version: 6.9.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
|
||||
License: ASL 2.0
|
||||
URL: http://launchpad.net/%{name}/
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Obsoletes: python-%{sname}-tests <= 4.1.1-3
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
%{?python_provide:%python_provide python2-neutronclient}
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pbr
|
||||
# Required for unit tests
|
||||
BuildRequires: python2-osc-lib-tests
|
||||
BuildRequires: python2-oslotest
|
||||
BuildRequires: python2-testtools
|
||||
BuildRequires: python2-testrepository
|
||||
BuildRequires: python2-testscenarios
|
||||
|
||||
Requires: python2-babel >= 2.3.4
|
||||
Requires: python2-iso8601 >= 0.1.11
|
||||
Requires: python2-os-client-config >= 1.28.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-log >= 3.36.0
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr
|
||||
Requires: python2-requests >= 2.14.2
|
||||
Requires: python2-six >= 1.10.0
|
||||
Requires: python2-debtcollector >= 1.2.0
|
||||
Requires: python2-osc-lib >= 1.10.0
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-keystoneclient >= 1:3.8.0
|
||||
Requires: python2-cliff >= 2.8.0
|
||||
%if 0%{?fedora} > 0
|
||||
Requires: python2-netaddr >= 0.7.18
|
||||
Requires: python2-simplejson >= 3.5.1
|
||||
%else
|
||||
Requires: python-netaddr >= 0.7.18
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
%endif
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}-tests
|
||||
Summary: Python API and CLI for OpenStack Neutron - Unit tests
|
||||
%{?python_provide:%python_provide python2-%{sname}-tests}
|
||||
Requires: python2-%{sname} == %{version}-%{release}
|
||||
Requires: python2-osc-lib-tests
|
||||
Requires: python2-oslotest
|
||||
Requires: python2-testtools
|
||||
Requires: python2-testrepository
|
||||
Requires: python2-testscenarios
|
||||
|
||||
%description -n python2-%{sname}-tests
|
||||
%{common_desc}
|
||||
|
||||
This package containts the unit tests.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Neutron
|
||||
%{?python_provide:%python_provide python3-neutronclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pbr
|
||||
# Required for unit tests
|
||||
BuildRequires: python3-osc-lib-tests
|
||||
BuildRequires: python3-oslotest
|
||||
BuildRequires: python3-testrepository
|
||||
BuildRequires: python3-testtools
|
||||
BuildRequires: python3-testscenarios
|
||||
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-cliff >= 2.8.0
|
||||
Requires: python3-iso8601 >= 0.1.11
|
||||
Requires: python3-netaddr >= 0.7.18
|
||||
Requires: python3-os-client-config >= 1.28.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-log >= 3.36.0
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-requests >= 2.14.2
|
||||
Requires: python3-simplejson >= 3.5.1
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-debtcollector >= 1.2.0
|
||||
Requires: python3-osc-lib >= 1.10.0
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-keystoneclient >= 1:3.8.0
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
|
||||
%package -n python3-%{sname}-tests
|
||||
Summary: Python API and CLI for OpenStack Neutron - Unit tests
|
||||
%{?python_provide:%python_provide python3-%{sname}-tests}
|
||||
Requires: python3-%{sname} == %{version}-%{release}
|
||||
Requires: python3-osc-lib-tests
|
||||
Requires: python3-oslotest
|
||||
Requires: python3-testrepository
|
||||
Requires: python3-testtools
|
||||
Requires: python3-testscenarios
|
||||
|
||||
%description -n python3-%{sname}-tests
|
||||
%{common_desc}
|
||||
|
||||
This package containts the unit tests.
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Neutron API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-reno
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-keystoneclient
|
||||
BuildRequires: python2-os-client-config
|
||||
BuildRequires: python2-osc-lib
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-cliff
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the dependencies
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
# Build HTML docs
|
||||
export PYTHONPATH=.
|
||||
sphinx-build -W -b html doc/source doc/build/html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/neutron %{buildroot}%{_bindir}/neutron-%{python3_version}
|
||||
ln -s ./neutron-%{python3_version} %{buildroot}%{_bindir}/neutron-3
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/neutron %{buildroot}%{_bindir}/neutron-%{python2_version}
|
||||
ln -s ./neutron-%{python2_version} %{buildroot}%{_bindir}/neutron-2
|
||||
ln -s ./neutron-2 %{buildroot}%{_bindir}/neutron
|
||||
|
||||
%check
|
||||
# (TODO) Ignore unit tests results until https://bugs.launchpad.net/python-neutronclient/+bug/1783789
|
||||
# is fixed.
|
||||
%{__python2} setup.py testr || true
|
||||
%if 0%{?with_python3}
|
||||
rm -rf .testrepository
|
||||
%{__python3} setup.py testr || true
|
||||
%endif
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/neutronclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_bindir}/neutron
|
||||
%{_bindir}/neutron-2
|
||||
%{_bindir}/neutron-%{python2_version}
|
||||
%exclude %{python2_sitelib}/neutronclient/tests
|
||||
|
||||
%files -n python2-%{sname}-tests
|
||||
%{python2_sitelib}/neutronclient/tests
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_bindir}/neutron-3
|
||||
%{_bindir}/neutron-%{python3_version}
|
||||
%exclude %{python3_sitelib}/neutronclient/tests
|
||||
|
||||
%files -n python3-%{sname}-tests
|
||||
%{python3_sitelib}/neutronclient/tests
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Thu Sep 20 2018 RDO <dev@lists.rdoproject.org> 6.9.1-1
|
||||
- Update to 6.9.1
|
||||
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 6.9.0-1
|
||||
- Update to 6.9.0
|
||||
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
From 6586f6e4ae2954382a638f80c8b039c8c446ad58 Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Wed, 27 Oct 2021 13:25:54 +0000
|
||||
Subject: [PATCH] Add wheel package
|
||||
|
||||
Add python3-neutronclient-wheel package.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 15 +++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 9b81157..6585170 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -73,3 +73,18 @@ Description: client API library for Neutron - Python 3.x
|
||||
capabilities (e.g., QoS, ACLs, network monitoring, etc).
|
||||
.
|
||||
This package provides the client and Python 3.x module.
|
||||
+
|
||||
+Package: python3-neutronclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: client API library for Neutron - Python 3.x
|
||||
+ Neutron provides an API to dynamically request and configure virtual networks.
|
||||
+ These networks connect "interfaces" from other OpenStack services (e.g., vNICs
|
||||
+ from Nova VMs). The Neutron API supports extensions to provide advanced network
|
||||
+ capabilities (e.g., QoS, ACLs, network monitoring, etc).
|
||||
+ .
|
||||
+ This package contains the Python3 wheel.
|
||||
+
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index b99f400..9fda3e8 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -12,7 +12,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
install -D -m 0644 tools/neutron.bash_completion $(CURDIR)/debian/python3-neutronclient/usr/share/bash-completion/completions/neutron
|
||||
|
||||
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 05a9cb2d2c40aae1061191cd1f8627a7f8986fee Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:54:00 +0000
|
||||
Subject: [PATCH] Remove openstackclient
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
tool.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index ac5fc13..097dadf 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -22,7 +22,6 @@ Build-Depends-Indep:
|
||||
python3-keystoneauth1,
|
||||
python3-keystoneclient,
|
||||
python3-netaddr,
|
||||
- python3-openstackclient,
|
||||
python3-openstackdocstheme,
|
||||
python3-os-client-config,
|
||||
python3-osc-lib,
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0001-Add-wheel-package.patch
|
||||
remove-openstackclient.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-neutronclient
|
||||
debver: 1:7.2.1-2
|
||||
dl_path:
|
||||
name: python-neutronclient-debian-7.2.1-2.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-neutronclient/-/archive/debian/7.2.1-2/python-neutronclient-debian-7.2.1-2.tar.gz
|
||||
md5sum: b48160cf9342e7123195d9748736cf99
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: 0881611bb106729f27ab4beb7b68b26fa7c658dc
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-neutronclient
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-nova
|
||||
PROJECT=nova
|
||||
PROJECT_REPO=https://opendev.org/openstack/nova.git
|
||||
PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient"
|
||||
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
||||
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
||||
CUSTOMIZATION="yum install -y openssh-clients"
|
||||
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-nova
|
||||
PROJECT=nova
|
||||
PROJECT_REPO=https://opendev.org/openstack/nova.git
|
||||
PROJECT_REF=stable/ussuri
|
||||
PIP_PACKAGES="pycrypto httplib2 pylint python-ironicclient"
|
||||
DIST_PACKAGES="openssh-clients openssh-server libvirt e2fsprogs"
|
||||
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
||||
CUSTOMIZATION="yum install -y openssh-clients"
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
BUILDER=loci
|
||||
LABEL=stx-nova
|
||||
PROJECT=nova
|
||||
PROJECT_REPO=https://opendev.org/openstack/nova.git
|
||||
PROJECT_REF=3fe8880d3759cbd7b19d75dcf235dfd5c511be13
|
||||
PIP_PACKAGES="\
|
||||
httplib2 \
|
||||
pycryptodomex \
|
||||
python-ironicclient
|
||||
"
|
||||
DIST_REPOS="OS"
|
||||
DIST_PACKAGES="\
|
||||
e2fsprogs \
|
||||
libvirt0 \
|
||||
libvirt-clients \
|
||||
libvirt-daemon \
|
||||
libvirt-daemon-driver-lxc \
|
||||
libvirt-daemon-driver-qemu \
|
||||
libvirt-daemon-driver-storage-gluster \
|
||||
libvirt-login-shell \
|
||||
openssh-client \
|
||||
openssh-server
|
||||
"
|
||||
PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache"
|
||||
CUSTOMIZATION="\
|
||||
sed -i 's/\(^\s*\)\(import oslo_service\)/\1# \2/' /var/lib/openstack/lib/python3*/site-packages/nova/monkey_patch.py && \
|
||||
sed -i 's/\(^\s*\)\(eventlet.hubs.use_hub(\"oslo_service:service_hub\")\)/\1# \2/' /var/lib/openstack/lib/python3*/site-packages/nova/monkey_patch.py && \
|
||||
mkdir -p /run/sshd
|
||||
"
|
||||
UPDATE_SYSTEM_ACCOUNT="yes"
|
||||
NON_UNIQUE_SYSTEM_ACCOUNT="yes"
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=python-novaclient
|
||||
SRC_DIR=$CGCS_BASE/git/python-novaclient
|
||||
TIS_BASE_SRCREV="15.1.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname novaclient
|
||||
%global with_doc 0
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Nova API. There's a Python API (the \
|
||||
novaclient module), and a command-line script (nova). Each implements 100% of \
|
||||
the OpenStack Nova API.
|
||||
|
||||
Name: python-novaclient
|
||||
Epoch: 1
|
||||
Version: 15.1.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/%{name}
|
||||
Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python2-novaclient}
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
|
||||
Requires: python2-babel >= 2.3.4
|
||||
Requires: python2-iso8601 >= 0.1.11
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr >= 2.0.0
|
||||
Requires: python2-prettytable >= 0.7.2
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
Requires: python2-six >= 1.10.0
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python3-novaclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-iso8601 >= 0.1.11
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-prettytable >= 0.7.2
|
||||
Requires: python3-simplejson >= 3.5.1
|
||||
Requires: python3-six >= 1.10.0
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Nova API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-prettytable
|
||||
BuildRequires: python2-sphinxcontrib-apidoc
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the requirements
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python3_version}
|
||||
ln -s ./nova-%{python3_version} %{buildroot}%{_bindir}/nova-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/novaclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python2_version}
|
||||
ln -s ./nova-%{python2_version} %{buildroot}%{_bindir}/nova-2
|
||||
|
||||
ln -s ./nova-2 %{buildroot}%{_bindir}/nova
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/nova.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/nova
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/novaclient/tests
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%{__python2} setup.py build_sphinx -b html
|
||||
# generate man page
|
||||
sphinx-build -b man doc/source doc/build/man
|
||||
install -p -D -m 644 doc/build/man/nova.1 %{buildroot}%{_mandir}/man1/nova.1
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
%endif
|
||||
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python2_sitelib}/%{sname}
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%endif
|
||||
%{_bindir}/nova
|
||||
%{_bindir}/nova-2
|
||||
%{_bindir}/nova-%{python2_version}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%if 0%{?with_doc}
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%endif
|
||||
%{_bindir}/nova-3
|
||||
%{_bindir}/nova-%{python3_version}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_doc}
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
%endif
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1:11.0.0-1
|
||||
- Update to 11.0.0
|
||||
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%global sname novaclient
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
%global common_desc \
|
||||
This is a client for the OpenStack Nova API. There's a Python API (the \
|
||||
novaclient module), and a command-line script (nova). Each implements 100% of \
|
||||
the OpenStack Nova API.
|
||||
|
||||
Name: python-novaclient
|
||||
Epoch: 1
|
||||
Version: 11.0.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
License: ASL 2.0
|
||||
URL: https://launchpad.net/%{name}
|
||||
Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
|
||||
%description
|
||||
%{common_desc}
|
||||
|
||||
%package -n python2-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python2-novaclient}
|
||||
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-pbr
|
||||
BuildRequires: python2-setuptools
|
||||
|
||||
Requires: python2-babel >= 2.3.4
|
||||
Requires: python2-iso8601 >= 0.1.11
|
||||
Requires: python2-keystoneauth1 >= 3.4.0
|
||||
Requires: python2-oslo-i18n >= 3.15.3
|
||||
Requires: python2-oslo-serialization >= 2.18.0
|
||||
Requires: python2-oslo-utils >= 3.33.0
|
||||
Requires: python2-pbr >= 2.0.0
|
||||
Requires: python2-prettytable >= 0.7.2
|
||||
Requires: python-simplejson >= 3.5.1
|
||||
Requires: python2-six >= 1.10.0
|
||||
|
||||
%description -n python2-%{sname}
|
||||
%{common_desc}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{sname}
|
||||
Summary: Python API and CLI for OpenStack Nova
|
||||
%{?python_provide:%python_provide python3-novaclient}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-iso8601 >= 0.1.11
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-utils >= 3.33.0
|
||||
Requires: python3-pbr >= 2.0.0
|
||||
Requires: python3-prettytable >= 0.7.2
|
||||
Requires: python3-simplejson >= 3.5.1
|
||||
Requires: python3-six >= 1.10.0
|
||||
|
||||
%description -n python3-%{sname}
|
||||
%{common_desc}
|
||||
%endif
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for OpenStack Nova API Client
|
||||
|
||||
BuildRequires: python2-sphinx
|
||||
BuildRequires: python2-openstackdocstheme
|
||||
BuildRequires: python2-oslo-utils
|
||||
BuildRequires: python2-keystoneauth1
|
||||
BuildRequires: python2-oslo-serialization
|
||||
BuildRequires: python2-prettytable
|
||||
|
||||
%description doc
|
||||
%{common_desc}
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{upstream_version} -S git
|
||||
|
||||
# Let RPM handle the requirements
|
||||
%py_req_cleanup
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
%py3_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python3_version}
|
||||
ln -s ./nova-%{python3_version} %{buildroot}%{_bindir}/nova-3
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python3_sitelib}/novaclient/tests
|
||||
%endif
|
||||
|
||||
%py2_install
|
||||
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python2_version}
|
||||
ln -s ./nova-%{python2_version} %{buildroot}%{_bindir}/nova-2
|
||||
|
||||
ln -s ./nova-2 %{buildroot}%{_bindir}/nova
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
|
||||
install -pm 644 tools/nova.bash_completion \
|
||||
%{buildroot}%{_sysconfdir}/bash_completion.d/nova
|
||||
|
||||
# Delete tests
|
||||
rm -fr %{buildroot}%{python2_sitelib}/novaclient/tests
|
||||
|
||||
%{__python2} setup.py build_sphinx -b html
|
||||
%{__python2} setup.py build_sphinx -b man
|
||||
|
||||
install -p -D -m 644 doc/build/man/nova.1 %{buildroot}%{_mandir}/man1/nova.1
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
%files -n python2-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python2_sitelib}/%{sname}
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%{_bindir}/nova
|
||||
%{_bindir}/nova-2
|
||||
%{_bindir}/nova-%{python2_version}
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{sname}
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{python3_sitelib}/%{sname}
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%{_sysconfdir}/bash_completion.d
|
||||
%{_mandir}/man1/nova.1.gz
|
||||
%{_bindir}/nova-3
|
||||
%{_bindir}/nova-%{python3_version}
|
||||
%endif
|
||||
|
||||
%files doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1:11.0.0-1
|
||||
- Update to 11.0.0
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
From 7052e77c581e01a9717ab5307291867a15ac349d Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Tue, 26 Oct 2021 16:59:10 +0000
|
||||
Subject: [PATCH 1/1] Add wheel support
|
||||
|
||||
Add python3-novaclient-wheel package.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 18 ++++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 9f941ca3..1092bc00 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -96,3 +96,21 @@ Description: client library for OpenStack Compute API - 3.x
|
||||
Compute (Nova) through the OpenStack Compute API.
|
||||
.
|
||||
This package provides the Python 3.x module.
|
||||
+
|
||||
+Package: python3-novaclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: client library for OpenStack Compute API - 3.x
|
||||
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller
|
||||
+ designed to be modular and easy to extend and adapt. In addition to its
|
||||
+ "native" OpenStack API, it also supports the Amazon EC2 API, and it supports
|
||||
+ many different database backends (including SQLite, MySQL, and PostgreSQL),
|
||||
+ hypervisors (KVM, Xen), and user directory systems (LDAP, SQL).
|
||||
+ .
|
||||
+ Python novaclient library and nova CLI tool for interacting with OpenStack
|
||||
+ Compute (Nova) through the OpenStack Compute API.
|
||||
+ .
|
||||
+ This package contains the Python3 Wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index c6e62433..e1f67507 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -12,7 +12,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
install -D -m 0644 tools/nova.bash_completion $(CURDIR)/debian/python3-novaclient-doc/usr/share/bash-completion/completions/nova
|
||||
rm -rf $(CURDIR)/debian/python-novaclient/usr/novaclient
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
0001-stx-add-wheel-support.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-novaclient
|
||||
debver: 2:17.2.1-3
|
||||
dl_path:
|
||||
name: python-novaclient-debian-17.2.1-3.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-novaclient/-/archive/debian/17.2.1-3/python-novaclient-debian-17.2.1-3.tar.gz
|
||||
md5sum: 14a3b8f4856737f1d36242c4c17b5c5f
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: a9863400da506e5d70b78f378865c7e169e685e1
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-novaclient
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
TAR_NAME=pankoclient
|
||||
SRC_DIR=$CGCS_BASE/git/python-pankoclient
|
||||
TIS_BASE_SRCREV="0.7.0"
|
||||
TIS_PATCH_VER=GITREVCOUNT
|
||||
|
|
@ -1,225 +0,0 @@
|
|||
%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
|
||||
%global pypi_name pankoclient
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora} >= 24
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
Name: python-pankoclient
|
||||
Version: 0.7.0
|
||||
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/openstack/%{name}
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python2-pip
|
||||
BuildRequires: python2-wheel
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: python-tools
|
||||
|
||||
Requires: python-keystoneauth1 >= 2.18.0
|
||||
Requires: python-osc-lib >= 1.2.0
|
||||
Requires: python-oslo-i18n >= 2.1.0
|
||||
Requires: python-oslo-serialization >= 1.10.0
|
||||
Requires: python-oslo-utils >= 3.18.0
|
||||
Requires: python-osprofiler >= 1.4.0
|
||||
Requires: python-pbr
|
||||
Requires: python-requests
|
||||
Requires: python-six >= 1.9.0
|
||||
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
|
||||
%package -n python-%{pypi_name}-doc
|
||||
Summary: Documentation for OpenStack Panko API Client
|
||||
Group: Documentation
|
||||
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: python-openstackdocstheme
|
||||
# FIXME: remove following line when a new release including https://review.openstack.org/#/c/476760/ is in u-c
|
||||
BuildRequires: python-oslo-sphinx
|
||||
BuildRequires: python-openstack-doc-tools
|
||||
BuildRequires: python-osc-lib
|
||||
# test
|
||||
BuildRequires: python-babel
|
||||
|
||||
%description doc
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool
|
||||
(panko).
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Panko Tests
|
||||
Requires: python-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-tools
|
||||
|
||||
Requires: python3-keystoneauth1 >= 2.18.0
|
||||
Requires: python3-osc-lib >= 1.2.0
|
||||
Requires: python3-oslo-i18n >= 2.1.0
|
||||
Requires: python3-oslo-serialization >= 1.10.0
|
||||
Requires: python3-oslo-utils >= 3.18.0
|
||||
Requires: python3-osprofiler >= 1.4.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-requests
|
||||
Requires: python3-six >= 1.9.0
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Panko Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%endif
|
||||
|
||||
%description
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{upstream_version} -S git
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
2to3 --write --nobackups %{py3dir}
|
||||
%endif
|
||||
|
||||
# Remove bundled egg-info
|
||||
rm -rf pankoclient.egg-info
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
%build
|
||||
export PBR_VERSION=%{version}
|
||||
%py2_build
|
||||
%py2_build_wheel
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py build
|
||||
popd
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
export PBR_VERSION=%{version}
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
popd
|
||||
mv %{buildroot}%{_bindir}/panko %{buildroot}%{_bindir}/panko-%{python3_version}
|
||||
ln -s ./panko-%{python3_version} %{buildroot}%{_bindir}/panko-3
|
||||
%endif
|
||||
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
mv %{buildroot}%{_bindir}/panko %{buildroot}%{_bindir}/panko-%{python2_version}
|
||||
ln -s %{_bindir}/panko-%{python2_version} %{buildroot}%{_bindir}/panko-2
|
||||
ln -s %{_bindir}/panko-2 %{buildroot}%{_bindir}/panko
|
||||
|
||||
# Some env variables required to successfully build our doc
|
||||
export PATH=$PATH:%{buildroot}%{_bindir}
|
||||
export LANG=en_US.utf8
|
||||
%{__python2} setup.py build_sphinx -b html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
# STX: stage wheels
|
||||
mkdir -p $RPM_BUILD_ROOT/wheels
|
||||
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/panko
|
||||
%{_bindir}/panko-2
|
||||
%{_bindir}/panko-%{python2_version}
|
||||
# XXX: man page build is broken
|
||||
#%{_mandir}/man1/panko.1*
|
||||
%{python2_sitelib}/pankoclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%exclude %{python2_sitelib}/pankoclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/pankoclient/tests
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/panko-3
|
||||
%{_bindir}/panko-%{python3_version}
|
||||
%{python3_sitelib}/pankoclient
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%exclude %{python3_sitelib}/pankoclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/pankoclient/tests
|
||||
|
||||
%endif
|
||||
|
||||
%files -n python-%{pypi_name}-doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%package wheels
|
||||
Summary: %{name} wheels
|
||||
|
||||
%description wheels
|
||||
Contains python wheels for %{name}
|
||||
|
||||
%files wheels
|
||||
/wheels/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 22 2018 RDO <dev@lists.rdoproject.org> 0.5.0-1
|
||||
- Update to 0.5.0
|
||||
|
||||
|
||||
|
|
@ -1,204 +0,0 @@
|
|||
%{!?python2_shortver: %global python2_shortver %(%{__python2} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
|
||||
|
||||
%global pypi_name pankoclient
|
||||
|
||||
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
||||
|
||||
%if 0%{?fedora} >= 24
|
||||
%global with_python3 1
|
||||
%endif
|
||||
|
||||
Name: python-pankoclient
|
||||
Version: 0.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/openstack/%{name}
|
||||
Source0: https://tarballs.openstack.org/%{name}/%{pypi_name}-%{upstream_version}.tar.gz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
|
||||
%package -n python2-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
%{?python_provide:%python_provide python2-%{pypi_name}}
|
||||
|
||||
|
||||
BuildRequires: git
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python-pbr
|
||||
BuildRequires: python-tools
|
||||
|
||||
Requires: python-keystoneauth1 >= 2.18.0
|
||||
Requires: python-osc-lib >= 1.2.0
|
||||
Requires: python-oslo-i18n >= 2.1.0
|
||||
Requires: python-oslo-serialization >= 1.10.0
|
||||
Requires: python-oslo-utils >= 3.18.0
|
||||
Requires: python-pbr
|
||||
Requires: python-requests
|
||||
Requires: python-six >= 1.9.0
|
||||
|
||||
|
||||
%description -n python2-%{pypi_name}
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
|
||||
%package -n python-%{pypi_name}-doc
|
||||
Summary: Documentation for OpenStack Panko API Client
|
||||
Group: Documentation
|
||||
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: python-openstackdocstheme
|
||||
# FIXME: remove following line when a new release including https://review.openstack.org/#/c/476760/ is in u-c
|
||||
BuildRequires: python-oslo-sphinx
|
||||
BuildRequires: python-openstack-doc-tools
|
||||
BuildRequires: python-osc-lib
|
||||
# test
|
||||
BuildRequires: python-babel
|
||||
|
||||
%description doc
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool
|
||||
(panko).
|
||||
|
||||
This package contains auto-generated documentation.
|
||||
|
||||
%package -n python2-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Panko Tests
|
||||
Requires: python-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{pypi_name}-tests
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-%{pypi_name}
|
||||
Summary: Python API and CLI for OpenStack Panko
|
||||
|
||||
%{?python_provide:%python_provide python3-%{pypi_name}}
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-pbr
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-tools
|
||||
|
||||
Requires: python3-keystoneauth1 >= 2.18.0
|
||||
Requires: python3-osc-lib >= 1.2.0
|
||||
Requires: python3-oslo-i18n >= 2.1.0
|
||||
Requires: python3-oslo-serialization >= 1.10.0
|
||||
Requires: python3-oslo-utils >= 3.18.0
|
||||
Requires: python3-pbr
|
||||
Requires: python3-requests
|
||||
Requires: python3-six >= 1.9.0
|
||||
|
||||
%description -n python3-%{pypi_name}
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%package -n python3-%{pypi_name}-tests
|
||||
Summary: Python API and CLI for OpenStack Panko Tests
|
||||
Requires: python3-%{pypi_name} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{pypi_name}-tests
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
%endif
|
||||
|
||||
%description
|
||||
This is a client library for Panko built on the Panko API. It
|
||||
provides a Python API (the pankoclient module) and a command-line tool.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{pypi_name}-%{upstream_version} -S git
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
2to3 --write --nobackups %{py3dir}
|
||||
%endif
|
||||
|
||||
# Remove bundled egg-info
|
||||
rm -rf pankoclient.egg-info
|
||||
|
||||
# Let RPM handle the requirements
|
||||
rm -f {,test-}requirements.txt
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py build
|
||||
popd
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
|
||||
popd
|
||||
mv %{buildroot}%{_bindir}/panko %{buildroot}%{_bindir}/panko-%{python3_version}
|
||||
ln -s ./panko-%{python3_version} %{buildroot}%{_bindir}/panko-3
|
||||
%endif
|
||||
|
||||
%{__python2} setup.py install --skip-build --root %{buildroot}
|
||||
mv %{buildroot}%{_bindir}/panko %{buildroot}%{_bindir}/panko-%{python2_version}
|
||||
ln -s %{_bindir}/panko-%{python2_version} %{buildroot}%{_bindir}/panko-2
|
||||
ln -s %{_bindir}/panko-2 %{buildroot}%{_bindir}/panko
|
||||
|
||||
# Some env variables required to successfully build our doc
|
||||
export PATH=$PATH:%{buildroot}%{_bindir}
|
||||
export LANG=en_US.utf8
|
||||
%{__python2} setup.py build_sphinx -b html
|
||||
|
||||
# Fix hidden-file-or-dir warnings
|
||||
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
|
||||
|
||||
%files -n python2-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/panko
|
||||
%{_bindir}/panko-2
|
||||
%{_bindir}/panko-%{python2_version}
|
||||
# XXX: man page build is broken
|
||||
#%{_mandir}/man1/panko.1*
|
||||
%{python2_sitelib}/pankoclient
|
||||
%{python2_sitelib}/*.egg-info
|
||||
%exclude %{python2_sitelib}/pankoclient/tests
|
||||
|
||||
%files -n python2-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python2_sitelib}/pankoclient/tests
|
||||
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-%{pypi_name}
|
||||
%doc README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/panko-3
|
||||
%{_bindir}/panko-%{python3_version}
|
||||
%{python3_sitelib}/pankoclient
|
||||
%{python3_sitelib}/*.egg-info
|
||||
%exclude %{python3_sitelib}/pankoclient/tests
|
||||
|
||||
%files -n python3-%{pypi_name}-tests
|
||||
%license LICENSE
|
||||
%{python3_sitelib}/pankoclient/tests
|
||||
|
||||
%endif
|
||||
|
||||
%files -n python-%{pypi_name}-doc
|
||||
%doc doc/build/html
|
||||
%license LICENSE
|
||||
|
||||
%changelog
|
||||
* Wed Aug 22 2018 RDO <dev@lists.rdoproject.org> 0.5.0-1
|
||||
- Update to 0.5.0
|
||||
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
From baa05e47ddc62bed291680d9ee37d37bb8bc594c Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Wed, 27 Oct 2021 14:29:42 +0000
|
||||
Subject: [PATCH] Add wheel package
|
||||
|
||||
Add python3-pankclient-wheel.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 19 +++++++++++++++++++
|
||||
debian/rules | 2 +-
|
||||
2 files changed, 20 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 007fc55..24470c7 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -83,3 +83,22 @@ Description: Client library for OpenStack panko server - Python 3.x
|
||||
command-line tool (openstack event).
|
||||
.
|
||||
This package provides the Python 3.x module.
|
||||
+
|
||||
+Package: python3-pankoclient-wheel
|
||||
+Architecture: all
|
||||
+Depends:
|
||||
+ python3-wheel,
|
||||
+ ${misc:Depends},
|
||||
+ ${python3:Depends},
|
||||
+Description: Client library for OpenStack panko server - Python 3.x
|
||||
+ The Panko project is an event storage service that provides the ability to
|
||||
+ store and querying event data generated by Ceilometer with potentially other
|
||||
+ sources.
|
||||
+ .
|
||||
+ Panko is a component of the Telemetry project.
|
||||
+ .
|
||||
+ This is a client library for Panko built on the Panko API. It provides a
|
||||
+ Python API (the pankoclient module) and a OSC (the openstackclient CLI)
|
||||
+ command-line tool (openstack event).
|
||||
+ .
|
||||
+ This package contains the Python wheel.
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 612ce0e..d770e0f 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -12,7 +12,7 @@ override_dh_auto_build:
|
||||
echo "Do nothing..."
|
||||
|
||||
override_dh_auto_install:
|
||||
- pkgos-dh_auto_install --no-py2
|
||||
+ pkgos-dh_auto_install --no-py2 --wheel
|
||||
|
||||
override_dh_auto_test:
|
||||
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
From 88f1f5f98b92555db1ccdd92f26b57dcd678636f Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Mon, 29 Nov 2021 20:55:20 +0000
|
||||
Subject: [PATCH] Remove python-openstackclient
|
||||
|
||||
Remove build-Depends-Indep for python-openstackclient as it is
|
||||
not being used and it is causing problems with the build-pkgs
|
||||
tool.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
debian/control | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 0647124..4d3dda6 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -17,7 +17,6 @@ Build-Depends-Indep:
|
||||
python3-coverage,
|
||||
python3-hacking,
|
||||
python3-keystoneauth1,
|
||||
- python3-openstackclient,
|
||||
python3-openstackdocstheme,
|
||||
python3-osc-lib,
|
||||
python3-oslo.i18n,
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
0001-Add-wheel-package.patch
|
||||
remove-openstackclient.patch
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
---
|
||||
debname: python-pankoclient
|
||||
debver: 1.1.0-2
|
||||
dl_path:
|
||||
name: python-pankoclient-debian-1.1.0-2.tar.gz
|
||||
url: https://salsa.debian.org/openstack-team/clients/python-pankoclient/-/archive/debian/1.1.0-2/python-pankoclient-debian-1.1.0-2.tar.gz
|
||||
md5sum: 4b623a6b3ad649b29e05fc83f6f03762
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
BASE_SRCREV: ff835e2707e5317148a2f3733060c5f1024d59a6
|
||||
SRC_DIR: ${MY_REPO}/stx/upstream/openstack/python-pankoclient
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue