starlingx
/
upstream
Code Issues Proposed changes

Merge remote-tracking branch 'gerrit/master' into f/centos76 

Change-Id: Ib7dd42b5d0696422eec9d695358dccb075a0dcc4
Signed-off-by: Saul Wold <sgw@linux.intel.com>
This commit is contained in:
Saul Wold 2019-03-04 17:46:14 -08:00
parent fd4305388d 53cfbc9f06
commit 1443710d8f
124 changed files with 7035 additions and 6575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
centos_iso_image.inc
View File

@ -40,7 +40,7 @@ python2-ironicclient
# python-magnumclient
python2-magnumclient
python-magnumclient-doc
python-magnumclient-tests
# python-magnumclient-tests
# openstack-magnum
python-magnum
@ -62,6 +62,8 @@ openstack-ceilometer-common
openstack-ceilometer-notification
openstack-ceilometer-ipmi
openstack-ceilometer-polling
# ceilometerclient is needed by horizon temporarily
python2-ceilometerclient
# openstack-cinder
openstack-cinder
@ -147,15 +149,6 @@ distributedcloud-dcorch
# distributedcloud-client
distributedcloud-client-dcmanagerclient
# openstack-aodh
openstack-aodh-compat
openstack-aodh-api
openstack-aodh-evaluator
openstack-aodh-notifier
openstack-aodh-listener
openstack-aodh-expirer
openstack-aodh-config
# openstack-panko
python-panko
openstack-panko-api

1
centos_master_docker_images.inc
View File

@ -3,6 +3,7 @@ openstack/openstack-ironic
openstack/openstack-magnum
openstack/openstack-murano
openstack/openstack-panko
openstack/python-barbican
openstack/python-ceilometer
openstack/python-cinder
openstack/python-glance

28
centos_pike_docker_images.inc
View File

@ -1,14 +1,14 @@
openstack/openstack-aodh
openstack/openstack-ironic
openstack/openstack-magnum
openstack/openstack-murano
openstack/openstack-panko
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/openstack-aodh
#openstack/openstack-ironic
#openstack/openstack-magnum
#openstack/openstack-murano
#openstack/openstack-panko
#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

1
centos_pike_wheels.inc
View File

@ -13,7 +13,6 @@ openstack-murano-ui-wheels
openstack-murano-wheels
openstack-neutron-wheels
openstack-nova-wheels
python-ceilometerclient-wheels
python-cinderclient-wheels
python-django-horizon-wheels
python-django-openstack-auth-wheels

8
centos_pkg_dirs
View File

@ -1,5 +1,3 @@
openstack/openstack-aodh
openstack/openstack-aodh-config
openstack/openstack-murano
openstack/python-muranoclient
openstack/openstack-murano-ui
@ -13,8 +11,8 @@ openstack/openstack-panko
openstack/openstack-panko-config
openstack/openstack-os-vif
openstack/python-aodhclient
openstack/python-barbicanclient
openstack/python-ceilometer
openstack/python-ceilometerclient
openstack/python-cinder
openstack/python-cinderclient
openstack/python-glance
@ -28,7 +26,6 @@ openstack/python-heatclient
openstack/python-horizon
openstack/python-keystone
openstack/python-keystoneclient
openstack/python-keystonemiddleware
openstack/python-networking-bgpvpn
openstack/python-networking-sfc
openstack/python-networking-odl
@ -42,11 +39,10 @@ openstack/python-openstackdocstheme
openstack/python-oslo-concurrency
openstack/python-oslo-service
openstack/python-oslo-messaging
openstack/python-pankoclient
openstack/rabbitmq-server
openstack/rabbitmq-server-config
openstack/python-keystoneauth1
openstack/python-openstackclient
openstack/python-osc-lib
openstack/python-openstacksdk
openstack/python-django-openstack-auth
openstack/python-wsme

2
openstack/openstack-helm-infra/centos/build_srpm.data
View File

@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*"
TIS_PATCH_VER=7
TIS_PATCH_VER=8

8
openstack/openstack-helm-infra/centos/openstack-helm-infra.spec
View File

@ -17,10 +17,10 @@ BuildArch: noarch
Patch01: 0001-gnocchi-chart-updates.patch
Patch02: Mariadb-Support-adoption-of-running-single-node-mari.patch
Patch03: Mariadb-Share-container-PID-namespaces-under-docker.patch
Patch04: 0004-Allow-multiple-containers-per-daemonset-pod.patch
Patch05: fix-type-error-to-streamline-single-replica-mariadb-.patch
Patch06: Add-imagePullSecrets-in-service-account.patch
Patch03: 0004-Allow-multiple-containers-per-daemonset-pod.patch
Patch04: fix-type-error-to-streamline-single-replica-mariadb-.patch
Patch05: Add-imagePullSecrets-in-service-account.patch
Patch06: 0006-Set-Min-NGINX-handles.patch
BuildRequires: helm

27
openstack/openstack-helm-infra/files/0006-Set-Min-NGINX-handles.patch Normal file
View File

@ -0,0 +1,27 @@
From dda42ea9d18cacb7059652e95fb1b689f175f6ac Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Wed, 20 Feb 2019 13:56:27 -0600
Subject: [PATCH 6/6] Set Min NGINX handles
---
mariadb/files/nginx.tmpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mariadb/files/nginx.tmpl b/mariadb/files/nginx.tmpl
index b74b2b6..9775d89 100644
--- a/mariadb/files/nginx.tmpl
+++ b/mariadb/files/nginx.tmpl
@@ -23,7 +23,9 @@ daemon off;
worker_processes {{ $cfg.WorkerProcesses }};
pid /run/nginx.pid;
-{{ if ne .MaxOpenFiles 0 }}
+{{ if lt .MaxOpenFiles 2048 }}
+worker_rlimit_nofile 2048;
+{{else}}
worker_rlimit_nofile {{ .MaxOpenFiles }};
{{ end}}
--
1.8.3.1

82
openstack/openstack-helm-infra/files/Mariadb-Share-container-PID-namespaces-under-docker.patch
View File

@ -1,82 +0,0 @@
From 977c523cef00f7919a82d268da7e55223f1864ce Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sat, 8 Dec 2018 16:16:11 -0600
Subject: [PATCH] Mariadb: Share container PID namespaces under docker
This PS shares pid namespaces for containers in pods under docker,
bringing running in this runtime inline with other runc based container
backends, allowing the pause process in the pod to act as a reaper.
Change-Id: Ib5fc101d930446d848246eb5ca4d554b756cb91f
Signed-off-by: Pete Birley <pete@port.direct>
---
mariadb/templates/deployment-error.yaml | 1 +
mariadb/templates/deployment-ingress.yaml | 1 +
mariadb/templates/monitoring/prometheus/exporter-deployment.yaml | 1 +
mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml | 1 +
mariadb/templates/statefulset.yaml | 1 +
5 files changed, 5 insertions(+)
diff --git a/mariadb/templates/deployment-error.yaml b/mariadb/templates/deployment-error.yaml
index c310324..78c4b18 100644
--- a/mariadb/templates/deployment-error.yaml
+++ b/mariadb/templates/deployment-error.yaml
@@ -42,6 +42,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
spec:
+ shareProcessNamespace: true
serviceAccountName: {{ $serviceAccountName }}
affinity:
{{ tuple $envAll "mariadb" "ingress-error-pages" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml
index 053a08f..afe9407 100644
--- a/mariadb/templates/deployment-ingress.yaml
+++ b/mariadb/templates/deployment-ingress.yaml
@@ -137,6 +137,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
spec:
+ shareProcessNamespace: true
serviceAccountName: {{ $serviceAccountName }}
affinity:
{{ tuple $envAll "mariadb" "ingress" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
index 274a06c..00b3f6e 100644
--- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -38,6 +38,7 @@ spec:
{{ tuple $envAll "prometheus_mysql_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
namespace: {{ .Values.endpoints.prometheus_mysql_exporter.namespace }}
spec:
+ shareProcessNamespace: true
serviceAccountName: {{ $serviceAccountName }}
nodeSelector:
{{ .Values.labels.prometheus_mysql_exporter.node_selector_key }}: {{ .Values.labels.prometheus_mysql_exporter.node_selector_value }}
diff --git a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
index df7a147..b9f7b56 100644
--- a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
+++ b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml
@@ -30,6 +30,7 @@ spec:
labels:
{{ tuple $envAll "prometheus_mysql_exporter" "create-sql-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
spec:
+ shareProcessNamespace: true
serviceAccountName: {{ $serviceAccountName }}
restartPolicy: OnFailure
nodeSelector:
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index de0fac2..c6aa451 100644
--- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml
@@ -91,6 +91,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
spec:
+ shareProcessNamespace: true
serviceAccountName: {{ $serviceAccountName }}
affinity:
{{ tuple $envAll "mariadb" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
--
1.8.3.1

2
openstack/openstack-helm/centos/build_srpm.data
View File

@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz"
COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* "
TIS_PATCH_VER=9
TIS_PATCH_VER=11

8
openstack/openstack-helm/centos/openstack-helm.spec
View File

@ -25,6 +25,10 @@ Patch04: Remove-stale-Apache2-service-pids-when-a-POD-starts.patch
Patch05: 0005-Add-heat-purge-deleted-cron-job.patch
Patch06: 0006-Enable-cold-migration-in-nova-helm-chart.patch
Patch07: 0007-Glance-chart-add-images-pool-replication.patch
Patch08: 0007-Stein-Remove-ceilometer-upgrade-option.patch
Patch09: 0008-Stein-Update-Cinder-to-include-resource_filters.json.patch
Patch10: 0009-Stein-add-log_config_append-to-neutron-etc.patch
Patch11: 0010-Stein-Nova-console-address-config-optionality.patch
BuildRequires: helm
BuildRequires: openstack-helm-infra
@ -42,6 +46,10 @@ Openstack Helm charts
%patch05 -p1
%patch06 -p1
%patch07 -p1
%patch08 -p1
%patch09 -p1
%patch10 -p1
%patch11 -p1
%build
# initialize helm and build the toolkit

27
openstack/openstack-helm/files/0007-Stein-Remove-ceilometer-upgrade-option.patch Normal file
View File

@ -0,0 +1,27 @@
From dc57c567018f8ab2c11bd7dd426cb1176d35e7db Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Fri, 11 Jan 2019 16:57:44 -0500
Subject: [PATCH 6/8] Stein: Remove ceilometer-upgrade option
This removes the --skip-metering-database option from _db-sync.sh.tpl.
This option was removed with the deprecated storage drivers in
Queens.
Signed-off-by: Robert Church <robert.church@windriver.com>
---
ceilometer/templates/bin/_db-sync.sh.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ceilometer/templates/bin/_db-sync.sh.tpl b/ceilometer/templates/bin/_db-sync.sh.tpl
index ba7c1d84..d649654b 100644
--- a/ceilometer/templates/bin/_db-sync.sh.tpl
+++ b/ceilometer/templates/bin/_db-sync.sh.tpl
@@ -18,4 +18,4 @@ limitations under the License.
set -ex
-exec ceilometer-upgrade --skip-metering-database
+exec ceilometer-upgrade
--
2.16.5

99
openstack/openstack-helm/files/0008-Stein-Update-Cinder-to-include-resource_filters.json.patch Normal file
View File

@ -0,0 +1,99 @@
From 26dc954e697b365ff8bca6a0f862f1053ed25648 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Fri, 11 Jan 2019 17:23:44 -0500
Subject: [PATCH 7/7] Stein: Update Cinder to include resource_filters.json
During Stein the deprecated query_volume_filters config option was
removed. As a result, /etc/cinder/resource_filters.json is required to
allow volume display operations to function.
This adds the file to the configmap and provides the default values for
the filters.
Signed-off-by: Robert Church <robert.church@windriver.com>
---
cinder/templates/configmap-etc.yaml | 1 +
cinder/templates/deployment-api.yaml | 4 ++++
cinder/values.yaml | 39 ++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+)
diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml
index 88d9fa07..5ed73db6 100644
--- a/cinder/templates/configmap-etc.yaml
+++ b/cinder/templates/configmap-etc.yaml
@@ -121,6 +121,7 @@ data:
policy.json: {{ toJson .Values.conf.policy | b64enc }}
cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
+ resource_filters.json: {{ toJson .Values.conf.resource_filters | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- $filePrefix := replace "_" "-" $key }}
{{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}
diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
index 9213d34f..82131579 100644
--- a/cinder/templates/deployment-api.yaml
+++ b/cinder/templates/deployment-api.yaml
@@ -109,6 +109,10 @@ spec:
mountPath: /etc/cinder/policy.json
subPath: policy.json
readOnly: true
+ - name: cinder-etc
+ mountPath: /etc/cinder/resource_filters.json
+ subPath: resource_filters.json
+ readOnly: true
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
- name: cinder-coordination
mountPath: {{ ( split "://" .Values.conf.cinder.coordination.backend_url )._1 }}
diff --git a/cinder/values.yaml b/cinder/values.yaml
index cd3eb1a2..e79f8f6f 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -865,6 +865,45 @@ conf:
sla:
failure_rate:
max: 0
+ resource_filters:
+ volume:
+ - name
+ - status
+ - metadata
+ - bootable
+ - migration_status
+ - availability_zone
+ - group_id
+ backup:
+ - name
+ - status
+ - volume_id
+ snapshot:
+ - name
+ - status
+ - volume_id
+ - metadata
+ - availability_zone
+ group: []
+ group_snapshot:
+ - status
+ - group_id
+ attachment:
+ - volume_id
+ - status
+ - instance_id
+ - attach_status
+ message:
+ - resource_uuid
+ - resource_type
+ - event_id
+ - request_id
+ - message_level
+ pool:
+ - name
+ - volume_type
+ volume_type: []
+
backup:
external_ceph_rbd:
--
2.16.5

38
openstack/openstack-helm/files/0009-Stein-add-log_config_append-to-neutron-etc.patch Normal file
View File

@ -0,0 +1,38 @@
From 6f72ebe170db5364287f3634359739d3f0c1c987 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Tue, 15 Jan 2019 03:39:27 -0500
Subject: [PATCH 8/8] Stein: add log_config_append to neutron-etc
neutron-sanity-check command triggers privsep code and produces the
following:
WARNING oslo.privsep.daemon [-] privsep log:
oslo_log.log.LogConfigError: Error loading logging config
/etc/neutron/logging.conf: [Errno 2] No such file or directory:
'/etc/neutron/logging.conf'
This will allow ovs-agent to successfully deploy
Signed-off-by: Robert Church <robert.church@windriver.com>
---
neutron/templates/daemonset-ovs-agent.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml
index 34aba253..af765bd7 100644
--- a/neutron/templates/daemonset-ovs-agent.yaml
+++ b/neutron/templates/daemonset-ovs-agent.yaml
@@ -94,6 +94,10 @@ spec:
mountPath: /etc/neutron/neutron.conf
subPath: neutron.conf
readOnly: true
+ - name: neutron-etc
+ mountPath: {{ .Values.conf.neutron.DEFAULT.log_config_append }}
+ subPath: {{ base .Values.conf.neutron.DEFAULT.log_config_append }}
+ readOnly: true
- name: neutron-etc
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
subPath: ml2_conf.ini
--
2.16.5

42
openstack/openstack-helm/files/0010-Stein-Nova-console-address-config-optionality.patch Normal file
View File

@ -0,0 +1,42 @@
From 9030eb81823e46eb374b52fec2e65fff2bb2dcf9 Mon Sep 17 00:00:00 2001
From: Gerry Kopec <Gerry.Kopec@windriver.com>
Date: Fri, 15 Feb 2019 16:15:37 -0500
Subject: [PATCH] Stein: Nova console address config optionality
Introduce option to nova to enable/disable the use of the vnc or spice
server proxyclient address found by the console compute init container.
This can be used to prevent the case where the found address overrides
what has already been defined in nova.conf by per host nova compute
daemonset overrides.
---
nova/templates/bin/_nova-compute.sh.tpl | 2 ++
nova/values.yaml | 1 +
2 files changed, 3 insertions(+)
diff --git a/nova/templates/bin/_nova-compute.sh.tpl b/nova/templates/bin/_nova-compute.sh.tpl
index 84596a5..b3bcca7 100644
--- a/nova/templates/bin/_nova-compute.sh.tpl
+++ b/nova/templates/bin/_nova-compute.sh.tpl
@@ -20,5 +20,7 @@ set -ex
exec nova-compute \
--config-file /etc/nova/nova.conf \
+{{- if .Values.console.address_search_enabled }}
--config-file /tmp/pod-shared/nova-console.conf \
+{{- end }}
--config-file /tmp/pod-shared/nova-libvirt.conf
diff --git a/nova/values.yaml b/nova/values.yaml
index 9646ded..c0ec7fe 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -438,6 +438,7 @@ console:
vncproxy:
# IF blank, search default routing interface
vncserver_proxyclient_interface:
+ address_search_enabled: true
ssh:
key_types:
--
1.8.3.1

4
openstack/python-aodhclient/centos/build_srpm.data
View File

@ -1 +1,3 @@
TIS_PATCH_VER=1
TAR_NAME=aodhclient
SRC_DIR=$CGCS_BASE/git/python-aodhclient
TIS_PATCH_VER=0

21
openstack/python-aodhclient/centos/meta_patches/0001-spec.patch
View File

@ -1,21 +0,0 @@
diff --git a/SPECS/python-aodhclient.spec b/SPECS/python-aodhclient.spec
index 5d60fe2..ec5afaa 100644
--- a/SPECS/python-aodhclient.spec
+++ b/SPECS/python-aodhclient.spec
@@ -8,13 +8,15 @@
Name: python-aodhclient
Version: 0.9.0
-Release: 1%{?dist}
+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
+Patch0: 0001-fix-interface.patch
+
BuildArch: noarch
%description

1
openstack/python-aodhclient/centos/meta_patches/PATCH_ORDER
View File

@ -1 +0,0 @@
0001-spec.patch

15
openstack/python-aodhclient/centos/patches/0001-fix-interface.patch
View File

@ -1,15 +0,0 @@
diff --git a/aodhclient/osc.py b/aodhclient/osc.py
index 1e8599f..a1ecfee 100644
--- a/aodhclient/osc.py
+++ b/aodhclient/osc.py
@@ -39,7 +39,9 @@ def make_client(instance):
API_VERSIONS)
# NOTE(sileht): ensure setup of the session is done
instance.setup_auth()
- return aodh_client(session=instance.session)
+ return aodh_client(session=instance.session,
+ interface=instance.interface,
+ region_name=instance.region_name)
def build_option_parser(parser):

207
openstack/python-aodhclient/centos/python-aodhclient.spec Normal file
View File

@ -0,0 +1,207 @@
%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%{?_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: 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
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/
# STX: prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version}
%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 sdk
Summary: SDK files for %{pypi_name}
%description sdk
Contains SDK files for %{pypi_name} package
%files sdk
/usr/share/remote-clients/%{pypi_name}-%{version}.tgz
%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

176
openstack/python-aodhclient/centos/python-aodhclient.spec.orig Normal file
View File

@ -0,0 +1,176 @@
%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
openstack/python-aodhclient/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/python-aodhclient-0.9.0-1.el7.src.rpm

6
openstack/python-barbican/centos/stx-barbican.master_docker_image Normal file
View File

@ -0,0 +1,6 @@
BUILDER=loci
LABEL=stx-barbican
PROJECT=barbican
PROJECT_REPO=https://github.com/openstack/barbican.git
PIP_PACKAGES="pycrypto"
PROFILES="fluent"

3
openstack/python-barbicanclient/centos/build_srpm.data Normal file
View File

@ -0,0 +1,3 @@
TAR_NAME=python-barbicanclient
SRC_DIR=$CGCS_BASE/git/python-barbicanclient
TIS_PATCH_VER=0

182
openstack/python-barbicanclient/centos/python-barbicanclient.spec Normal file
View File

@ -0,0 +1,182 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global sname barbicanclient
%if 0%{?fedora}
%global with_python3 1
%endif
%global common_desc \
This is a client for the Barbican Key Management API. There is a \
Python library for accessing the API (barbicanclient module), and \
a command-line script (barbican).
Name: python-barbicanclient
Version: 4.7.1
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client Library for OpenStack Barbican Key Management API
License: ASL 2.0
URL: https://pypi.python.org/pypi/python-barbicanclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
BuildArch: noarch
%description
%{common_desc}
%package -n python2-%{sname}
Summary: Client Library for OpenStack Barbican Key Management API
BuildRequires: python2-devel
BuildRequires: python2-pbr
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python2-setuptools
BuildRequires: git
Requires: python2-requests
Requires: python2-six >= 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-prettytable
Requires: python2-keystoneauth1 >= 3.4.0
Requires: python2-pbr >= 2.0.0
%if 0%{?fedora} > 0
Requires: python2-cliff
%else
Requires: python-cliff
%endif
%{?python_provide:%python_provide python2-%{sname}}
%description -n python2-%{sname}
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{sname}
Summary: Client Library for OpenStack Barbican Key Management API
BuildRequires: python3-devel
BuildRequires: python3-pbr
BuildRequires: python3-setuptools
Requires: python3-requests
Requires: python3-six >= 1.10.0
Requires: python3-cliff
Requires: python3-oslo-i18n >= 3.15.3
Requires: python3-oslo-serialization >= 2.18.0
Requires: python3-oslo-utils >= 3.33.0
Requires: python3-prettytable
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-pbr >= 2.0.0
%{?python_provide:%python_provide python3-%{sname}}
%description -n python3-%{sname}
%{common_desc}
%endif
%package doc
Summary: Documentation for OpenStack Barbican API client
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
BuildRequires: python2-oslo-utils
BuildRequires: python2-oslo-i18n
BuildRequires: python2-prettytable
%description doc
Documentation for the barbicanclient module
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# let RPM handle deps
sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
rm -rf {test-,}requirements.txt
%build
export PBR_VERSION=%{version}
%py2_build
%py2_build_wheel
%if 0%{?with_python3}
%py3_build
%endif
# doc
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.buildinfo
%install
export PBR_VERSION=%{version}
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python3_version}
ln -s ./barbican-%{python3_version} %{buildroot}%{_bindir}/barbican-3
%endif
%py2_install
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python2_version}
ln -s ./barbican-%{python2_version} %{buildroot}%{_bindir}/barbican-2
ln -s ./barbican-2 %{buildroot}%{_bindir}/barbican
# STX: stage wheels
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
# STX: prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%files -n python2-%{sname}
%license LICENSE
%doc AUTHORS CONTRIBUTING.rst README.rst ChangeLog
%{_bindir}/barbican
%{_bindir}/barbican-2*
%{python2_sitelib}/barbicanclient
%{python2_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
%if 0%{?with_python3}
%files -n python3-%{sname}
%license LICENSE
%doc AUTHORS CONTRIBUTING.rst README.rst ChangeLog
%{_bindir}/barbican-3*
%{python3_sitelib}/barbicanclient
%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
%endif
%files doc
%doc doc/build/html
%license LICENSE
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
%package wheels
Summary: %{name} wheels
%description wheels
Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Tue Nov 27 2018 RDO <dev@lists.rdoproject.org> 4.7.1-1
- Update to 4.7.1
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 4.7.0-1
- Update to 4.7.0

152
openstack/python-barbicanclient/centos/python-barbicanclient.spec.orig Normal file
View File

@ -0,0 +1,152 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global sname barbicanclient
%if 0%{?fedora}
%global with_python3 1
%endif
%global common_desc \
This is a client for the Barbican Key Management API. There is a \
Python library for accessing the API (barbicanclient module), and \
a command-line script (barbican).
Name: python-barbicanclient
Version: 4.7.1
Release: 1%{?dist}
Summary: Client Library for OpenStack Barbican Key Management API
License: ASL 2.0
URL: https://pypi.python.org/pypi/python-barbicanclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
BuildArch: noarch
%description
%{common_desc}
%package -n python2-%{sname}
Summary: Client Library for OpenStack Barbican Key Management API
BuildRequires: python2-devel
BuildRequires: python2-pbr
BuildRequires: python2-setuptools
BuildRequires: git
Requires: python2-requests
Requires: python2-six >= 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-prettytable
Requires: python2-keystoneauth1 >= 3.4.0
Requires: python2-pbr >= 2.0.0
%if 0%{?fedora} > 0
Requires: python2-cliff
%else
Requires: python-cliff
%endif
%{?python_provide:%python_provide python2-%{sname}}
%description -n python2-%{sname}
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{sname}
Summary: Client Library for OpenStack Barbican Key Management API
BuildRequires: python3-devel
BuildRequires: python3-pbr
BuildRequires: python3-setuptools
Requires: python3-requests
Requires: python3-six >= 1.10.0
Requires: python3-cliff
Requires: python3-oslo-i18n >= 3.15.3
Requires: python3-oslo-serialization >= 2.18.0
Requires: python3-oslo-utils >= 3.33.0
Requires: python3-prettytable
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-pbr >= 2.0.0
%{?python_provide:%python_provide python3-%{sname}}
%description -n python3-%{sname}
%{common_desc}
%endif
%package doc
Summary: Documentation for OpenStack Barbican API client
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
BuildRequires: python2-oslo-utils
BuildRequires: python2-oslo-i18n
BuildRequires: python2-prettytable
%description doc
Documentation for the barbicanclient module
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# let RPM handle deps
sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
rm -rf {test-,}requirements.txt
%build
%py2_build
%if 0%{?with_python3}
%py3_build
%endif
# doc
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.buildinfo
%install
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python3_version}
ln -s ./barbican-%{python3_version} %{buildroot}%{_bindir}/barbican-3
%endif
%py2_install
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python2_version}
ln -s ./barbican-%{python2_version} %{buildroot}%{_bindir}/barbican-2
ln -s ./barbican-2 %{buildroot}%{_bindir}/barbican
%files -n python2-%{sname}
%license LICENSE
%doc AUTHORS CONTRIBUTING.rst README.rst PKG-INFO ChangeLog
%{_bindir}/barbican
%{_bindir}/barbican-2*
%{python2_sitelib}/barbicanclient
%{python2_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
%if 0%{?with_python3}
%files -n python3-%{sname}
%license LICENSE
%doc AUTHORS CONTRIBUTING.rst README.rst PKG-INFO ChangeLog
%{_bindir}/barbican-3*
%{python3_sitelib}/barbicanclient
%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
%endif
%files doc
%doc doc/build/html
%license LICENSE
%changelog
* Tue Nov 27 2018 RDO <dev@lists.rdoproject.org> 4.7.1-1
- Update to 4.7.1
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 4.7.0-1
- Update to 4.7.0

10
openstack/python-ceilometerclient/centos/build_srpm.data
View File

@ -1,10 +0,0 @@
TAR_NAME=python-ceilometerclient
SRC_DIR=$CGCS_BASE/git/python-ceilometerclient
# Tar everything found in this subdirectory. Define this if source need to be collected into a tarball in SOURCES.
# Tar file name and version are derived from PKG-INFO. Alternatively you may define TAR_NAME ad VERSION
# A Space separated list of paths to copy to .distro/centos7/rpmbuild/SOURCES.
#COPY_LIST="$CGCS_BASE/downloads/$CLIENT_NAME-$CLIENT_VER.tar.gz $PKG_BASE/$CLIENT_NAME/*"
TIS_BASE_SRCREV=3d4966e6a76c63f6bf4a24d3cb3f86d7a585c1e0
TIS_PATCH_VER=GITREVCOUNT

207
openstack/python-ceilometerclient/centos/python-ceilometerclient.spec
View File

@ -1,207 +0,0 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%if 0%{?fedora}
%global with_python3 1
%endif
%global sname ceilometerclient
%global sum Python API and CLI for OpenStack Ceilometer
Name: python-ceilometerclient
Version: 2.9.0
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: %{sum}
License: ASL 2.0
URL: https://github.com/openstack/%{name}
Source0: %{name}-%{upstream_version}.tar.gz
BuildArch: noarch
BuildRequires: git
BuildRequires: python-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python2-devel
BuildRequires: python-pbr >= 1.6
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr >= 1.6
%endif
%description
This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ceilometerclient module) and a command-line tool
(ceilometer).
%package -n python2-%{sname}
Summary: %{sum}
# from requirements.txt
Requires: python-iso8601
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.17.0
Requires: python-requests >= 2.8.1
Requires: python-six >= 1.9.0
Requires: python-stevedore
Requires: python-pbr
Requires: python-keystoneauth1 >= 2.1.0
Requires: python-prettytable
%{?python_provide:%python_provide python2-%{sname}}
%description -n python2-%{sname}
This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ceilometerclient module) and a command-line tool
(ceilometer).
%if 0%{?with_python3}
%package -n python3-%{sname}
Summary: %{sum}
# from requirements.txt
Requires: python3-iso8601
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.17.0
Requires: python3-requests >= 2.8.1
Requires: python3-six >= 1.9.0
Requires: python3-stevedore
Requires: python3-pbr
Requires: python3-keystoneauth1 >= 2.1.0
Requires: python3-prettytable
%{?python_provide:%python_provide python3-%{sname}}
# WRS installs to usr/lib and not /usr/lib64
%description -n python3-%{sname}
This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ceilometerclient module) and a command-line tool
(ceilometer).
%endif # with_python3
%package doc
Summary: Documentation for OpenStack Ceilometer API Client
BuildRequires: python-sphinx
# FIXME: remove following line when a new release including https://review.openstack.org/#/c/476759/ is in u-u
BuildRequires: python-oslo-sphinx
BuildRequires: python-openstackdocstheme
%description doc
This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ceilometerclient module) and a command-line tool
(ceilometer).
This package contains auto-generated documentation.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Remove bundled egg-info
rm -rf python_%{sname}.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}
%py3_build
%endif
%install
export PBR_VERSION=%{version}
%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
%if 0%{?with_python3}
%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
%endif
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/ceilometer %{buildroot}%{_bindir}/ceilometer-%{python3_version}
ln -s ./ceilometer-%{python3_version} %{buildroot}%{_bindir}/ceilometer-3
%endif
%py2_install
mv %{buildroot}%{_bindir}/ceilometer %{buildroot}%{_bindir}/ceilometer-%{python2_version}
ln -s ./ceilometer-%{python2_version} %{buildroot}%{_bindir}/ceilometer-2
ln -s ./ceilometer-2 %{buildroot}%{_bindir}/ceilometer
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/%{sname}/tests
%if 0%{?with_python3}
rm -fr %{buildroot}%{python3_sitelib}/%{sname}/tests
%endif
# Build HTML docs
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
# WRS
install -d %{buildroot}/%{_sysconfdir}/bash_completion.d
install -m 664 tools/ceilometer.bash_completion %{buildroot}/%{_sysconfdir}/bash_completion.d/ceilometer.bash_completion
# prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%files -n python2-%{sname}
%license LICENSE
%doc README.rst
%{python2_sitelib}/%{sname}
%{python2_sitelib}/*.egg-info
%{_bindir}/ceilometer
%{_bindir}/ceilometer-2
%{_bindir}/ceilometer-%{python2_version}
%{_sysconfdir}/bash_completion.d/ceilometer.bash_completion
%if 0%{?with_python3}
%files -n python3-%{sname}
%license LICENSE
%doc README.rst
%{python3_sitelib}/%{sname}
%{python3_sitelib}/*.egg-info
%{_bindir}/ceilometer-3
%{_bindir}/ceilometer-%{python3_version}
%{_sysconfdir}/bash_completion.d/ceilometer.bash_completion
%endif # with_python3
%files doc
%license LICENSE
%doc doc/build/html
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
%package wheels
Summary: %{name} wheels
%description wheels
Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 2.9.0-1
- Update to 2.9.0

9
openstack/python-cinderclient/centos/build_srpm.data
View File

@ -1,10 +1,3 @@
TAR_NAME=python-cinderclient
SRC_DIR=$CGCS_BASE/git/python-cinderclient
# Tar everything found in this subdirectory. Define this if source need to be collected into a tarball in SOURCES.
# Tar file name and version are derived from PKG-INFO. Alternatively you may define TAR_NAME ad VERSION
# A Space separated list of paths to copy to .distro/centos7/rpmbuild/SOURCES.
#COPY_LIST="$CGCS_BASE/downloads/$CLIENT_NAME-$CLIENT_VER.tar.gz $PKG_BASE/$CLIENT_NAME/*"
TIS_BASE_SRCREV=3640aeab6e11987288a2f149fbeedb1c026045e2
TIS_PATCH_VER=GITREVCOUNT
TIS_PATCH_VER=0

77
openstack/python-cinderclient/centos/python-cinderclient.spec
View File

@ -5,8 +5,12 @@
%global with_python3 1
%endif
%global common_desc \
Client library (cinderclient python module) and command line utility \
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
Name: python-cinderclient
Version: 3.1.0
Version: 4.0.1
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Cinder
@ -19,34 +23,39 @@ BuildArch: noarch
BuildRequires: git
%description
Client library (cinderclient python module) and command line utility
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
%{common_desc}
%package -n python2-%{sname}
Summary: Python API and CLI for OpenStack Cinder
%{?python_provide:%python_provide python2-%{sname}}
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python-pbr
BuildRequires: python2-pbr
%if 0%{?fedora} > 0
BuildRequires: python2-d2to1
%else
BuildRequires: python-d2to1
%endif
Requires: python-babel
Requires: python-pbr
Requires: python-prettytable
Requires: python-requests
Requires: python-setuptools
Requires: python2-babel
Requires: python2-pbr
Requires: python2-prettytable
Requires: python2-requests
Requires: python2-six
Requires: python2-keystoneauth1 >= 3.4.0
Requires: python2-oslo-i18n >= 3.15.3
Requires: python2-oslo-utils >= 3.33.0
%if 0%{?fedora} > 0
Requires: python2-simplejson
%else
Requires: python-simplejson
Requires: python-six
Requires: python-keystoneauth1 >= 2.21.0
Requires: python-oslo-i18n >= 3.9.0
Requires: python-oslo-utils >= 3.20.0
%endif
%description -n python2-%{sname}
Client library (cinderclient python module) and command line utility
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
%{common_desc}
%if 0%{?with_python3}
@ -66,13 +75,12 @@ Requires: python3-requests
Requires: python3-setuptools
Requires: python3-simplejson
Requires: python3-six
Requires: python3-keystoneauth1 >= 2.21.0
Requires: python3-oslo-i18n >= 3.9.0
Requires: python3-oslo-utils >= 3.20.0
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-oslo-i18n >= 3.15.3
Requires: python3-oslo-utils >= 3.33.0
%description -n python3-%{sname}
Client library (cinderclient python module) and command line utility
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
%{common_desc}
%endif
@ -85,16 +93,10 @@ BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
%description doc
Client library (cinderclient python module) and command line utility
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
%{common_desc}
This package contains auto-generated documentation.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%prep
%autosetup -n %{name}-%{upstream_version} -S git
@ -113,12 +115,8 @@ export PBR_VERSION=%{version}
%py3_build
%endif
# FIXME (amoralej): following manual edit on conf.py is required for man page
# until https://review.openstack.org/#/c/489123 is merged
sed -i 's/man\/cinder/user\/cinder/' doc/source/conf.py
%{__python2} setup.py build_sphinx -b html
%{__python2} setup.py build_sphinx -b man
sphinx-build -W -b html doc/source doc/build/html
sphinx-build -W -b man doc/source doc/build/man
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
@ -151,6 +149,7 @@ install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%files -n python2-%{sname}
%doc README.rst
%license LICENSE
@ -173,6 +172,12 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='
%files doc
%doc doc/build/html
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
@ -186,6 +191,6 @@ Contains python wheels for %{name}
/wheels/*
%changelog
* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 3.1.0-1
- Update to 3.1.0
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 4.0.1-1
- Update to 4.0.1

166
openstack/python-cinderclient/centos/python-cinderclient.spec.orig Normal file
View File

@ -0,0 +1,166 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global sname cinderclient
%if 0%{?fedora}
%global with_python3 1
%endif
%global common_desc \
Client library (cinderclient python module) and command line utility \
(cinder) for interacting with OpenStack Cinder (Block Storage) API.
Name: python-cinderclient
Version: 4.0.1
Release: 1%{?dist}
Summary: Python API and CLI for OpenStack Cinder
License: ASL 2.0
URL: http://github.com/openstack/python-cinderclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
BuildArch: noarch
BuildRequires: git
%description
%{common_desc}
%package -n python2-%{sname}
Summary: Python API and CLI for OpenStack Cinder
%{?python_provide:%python_provide python2-%{sname}}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pbr
%if 0%{?fedora} > 0
BuildRequires: python2-d2to1
%else
BuildRequires: python-d2to1
%endif
Requires: python2-babel
Requires: python2-pbr
Requires: python2-prettytable
Requires: python2-requests
Requires: python2-six
Requires: python2-keystoneauth1 >= 3.4.0
Requires: python2-oslo-i18n >= 3.15.3
Requires: python2-oslo-utils >= 3.33.0
%if 0%{?fedora} > 0
Requires: python2-simplejson
%else
Requires: python-simplejson
%endif
%description -n python2-%{sname}
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{sname}
Summary: Python API and CLI for OpenStack Cinder
%{?python_provide:%python_provide python3-%{sname}}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr
BuildRequires: python3-d2to1
Requires: python3-babel
Requires: python3-pbr
Requires: python3-prettytable
Requires: python3-requests
Requires: python3-setuptools
Requires: python3-simplejson
Requires: python3-six
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-oslo-i18n >= 3.15.3
Requires: python3-oslo-utils >= 3.33.0
%description -n python3-%{sname}
%{common_desc}
%endif
%package doc
Summary: Documentation for OpenStack Cinder API Client
Group: Documentation
BuildRequires: python-reno
BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
%description doc
%{common_desc}
This package contains auto-generated documentation.
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Remove bundled egg-info
rm -rf python_cinderclient.egg-info
# Let RPM handle the requirements
rm -f {,test-}requirements.txt
%build
%py2_build
%if 0%{?with_python3}
%py3_build
%endif
sphinx-build -W -b html doc/source doc/build/html
sphinx-build -W -b man doc/source doc/build/man
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
%install
%if 0%{?with_python3}
%py3_install
mv %{buildroot}%{_bindir}/cinder %{buildroot}%{_bindir}/cinder-%{python3_version}
ln -s ./cinder-%{python3_version} %{buildroot}%{_bindir}/cinder-3
# Delete tests
rm -fr %{buildroot}%{python3_sitelib}/cinderclient/tests
%endif
%py2_install
mv %{buildroot}%{_bindir}/cinder %{buildroot}%{_bindir}/cinder-%{python2_version}
ln -s ./cinder-%{python2_version} %{buildroot}%{_bindir}/cinder-2
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/cinderclient/tests
ln -s ./cinder-2 %{buildroot}%{_bindir}/cinder
install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion
install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1
%files -n python2-%{sname}
%doc README.rst
%license LICENSE
%{_bindir}/cinder
%{_bindir}/cinder-2*
%{python2_sitelib}/cinderclient
%{python2_sitelib}/*.egg-info
%{_sysconfdir}/bash_completion.d/cinder.bash_completion
%{_mandir}/man1/cinder.1*
%if 0%{?with_python3}
%files -n python3-%{sname}
%doc README.rst
%license LICENSE
%{_bindir}/cinder-3*
%{python3_sitelib}/cinderclient
%{python3_sitelib}/*.egg-info
%endif
%files doc
%doc doc/build/html
%changelog
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 4.0.1-1
- Update to 4.0.1

4
openstack/python-glanceclient/centos/build_srpm.data
View File

@ -1,5 +1,3 @@
TAR_NAME=python-glanceclient
SRC_DIR="$CGCS_BASE/git/python-glanceclient"
COPY_LIST="$FILES_BASE/*"
TIS_BASE_SRCREV=13b25ff1fed908cfe7b4e719a97efd7121e3be96
TIS_PATCH_VER=GITREVCOUNT
TIS_PATCH_VER=0

209
openstack/python-glanceclient/centos/files/image-backup.sh
View File

@ -1,209 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2016 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
backup_dir="/opt/backups"
tmp_dir="${backup_dir}/image_temp"
function usage {
cat <<"EOF"
Helper tool for backing up Glance images
Usage:
image-backup export <uuid> - export the image with <uuid> into backup file /opt/backups/image_<uuid>.tgz
image-backup import image_<uuid>.tgz - import the image from the backup source file at /opt/backups/image_<uuid>.tgz
into the corresponding image.
Temporary files are stored in /opt/backups/image_temp
Please consult the System Backups section of the Administration Guide.
EOF
}
function create_tmp {
if [ ! -d ${backup_dir} ]; then
echo "Error: backup directory ${backup_dir} does not exist"
exit 1
fi
# Create temporary directory
if [ ! -d ${tmp_dir} ]; then
mkdir ${tmp_dir}
fi
}
function remove_tmp {
# Remove temporary files and directory if not empty
local uuid=$1
rm -f ${tmp_dir}/${uuid}*
rmdir --ignore-fail-on-non-empty ${tmp_dir} &>/dev/null
}
function export_file_from_rbd_image {
local file=$1
rbd export -p images ${file} ${tmp_dir}/${file}
if [ $? -ne 0 ]; then
echo "Error: Failed to export image ${file} from Ceph images pool, please check status of storage cluster"
remove_tmp; exit 1
fi
}
function export_image {
local uuid=$1
# Check if the corresponding image is present in the RBD pool
rbd -p images ls | grep -q -e "^${uuid}$"
if [ $? -ne 0 ]; then
echo "Error: Corresponding file for image with id: ${uuid} was not found in the RBD images pool"
remove_tmp; exit 1
fi
# Export original image
export_file_from_rbd_image ${uuid}
# Export raw cache if present
rbd -p images ls | grep -q ${uuid}_raw
if [ $? -eq 0 ]; then
export_file_from_rbd_image ${uuid}_raw
raw="${uuid}_raw"
fi
echo -n "Creating backup archive..."
archive="${backup_dir}/image_${uuid}.tgz"
tar czf ${archive} -C ${tmp_dir} ${uuid} ${raw}
if [ $? -ne 0 ]; then
echo "Error: Failed to create archive ${archive}"
remove_tmp; exit 1
else
echo "done"
fi
echo "Backup archive ${archive} created"
}
function import_file_to_rbd_image {
local file=$1
local snap="images/${file}@snap"
rbd import --image-format 2 ${tmp_dir}/${file} images/${file}
if [ $? -ne 0 ]; then
echo "Error: Failed to import image ${file} into Ceph images pool, please check status of storage cluster"
remove_tmp; exit 1
fi
rbd snap create ${snap} 1>/dev/null
if [ $? -ne 0 ]; then
echo "Error: Failed to create snapshot ${snap}, please check status of storage cluster"
remove_tmp; exit 1
fi
rbd snap protect ${snap} 1>/dev/null
if [ $? -ne 0 ]; then
echo "Error: Failed to protect snapshot ${snap}, please check status of storage cluster"
remove_tmp; exit 1
fi
}
function import_image {
local uuid=$1
# Storage cluster must be healthy before starting the import
if [ ! "$(ceph health)" = "HEALTH_OK" ]; then
echo "Error: The storage cluster health must be HEALTH_OK before proceding"
remove_tmp; exit 1
fi
# Check if the corresponding image is already present in the RBD pool
rbd -p images ls | grep -q -e "^${uuid}$"
if [ $? -eq 0 ]; then
echo "Error: Image with id: ${uuid} is already imported"
remove_tmp; exit 1
fi
# Import original image
import_file_to_rbd_image ${uuid}
# Import raw cache
if [ -f "${tmp_dir}/${uuid}_raw" ]; then
import_file_to_rbd_image ${uuid}_raw
fi
}
if [ $EUID -ne 0 ]; then
echo "This script must be executed as root"
exit 1
fi
if [ $# -ne 2 ]; then
usage
exit 0
fi
source /etc/nova/openrc
# Check if glance is using ceph as RBD
cat /etc/glance/glance-api.conf | grep -q -e "^stores.*=.*rbd"
if [ $? -ne 0 ]; then
echo "Error: Glance is not configured to use the ceph backend."
echo "This command should be used only on setups with configured Ceph storage."
exit 1
fi
if [ "$1" = "export" ]; then
# Check that glance image is present in glance
glance image-list | tail -n +3 | awk '{print $2}' | grep -q $2
if [ $? -ne 0 ]; then
echo "Error: Glance image with id: $2 not found. Please try with an existing image id."
remove_tmp; exit 1
fi
# Only allow backup of images that use rbd as backend.
glance image-show $2 | grep 'direct_url' | awk '{print $4}' | grep -q '^rbd://'
if [ $? -ne 0 ]; then
echo "Image with id: $2 is not stored in Ceph RBD. Backup using image-backup tool is not needed."
echo "Please consult the Software Management Manual for more details."
remove_tmp; exit 1
fi
create_tmp
export_image $2
remove_tmp
elif [ "$1" = "import" ]; then
# Check that the input file format is correct
if [[ ! $2 =~ ^image_.*\.tgz$ ]]; then
echo "Error: Source file name must conform to image_<uuid>.tgz format"
exit 1
fi
# Check that the source file exists
if [ ! -f ${backup_dir}/$2 ]; then
echo "Error: File $2 does not exists in ${backup_dir}"
exit 1
fi
# Get glance uuid from filename
uuid=$(echo $2 | sed "s/^image_\(.*\)\.tgz/\1/g")
# Check that glance has this image in the database
glance image-list | grep -q $uuid
if [ $? -ne 0 ]; then
echo "Error: Glance image with id: ${uuid} not found. Please try with an existing image id."
exit 1
fi
create_tmp
# Extract the files that need to be imported into the temp directory
echo -n "Extracting files..."
tar xfz ${backup_dir}/$2 -C ${tmp_dir} 1>/dev/null
if [ $? -ne 0 ]; then
echo "Error: Failed to extract archive ${backup_dir}/$2 into ${tmp_dir}."
remove_tmp; exit 1
fi
echo "done"
# Importing images into RBD
import_image $uuid
remove_tmp
else
usage
fi

129
openstack/python-glanceclient/centos/python-glanceclient.spec
View File

@ -1,31 +1,34 @@
%{!?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.8.0
Version: 2.13.1
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
#WRS
Source1: image-backup.sh
BuildArch: noarch
BuildRequires: git
BuildRequires: openstack-macros
%description
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.
%{common_desc}
%package -n python2-%{sname}
Summary: Python API and CLI for OpenStack Glance
@ -34,24 +37,27 @@ Summary: Python API and CLI for OpenStack Glance
BuildRequires: python2-devel
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python-setuptools
BuildRequires: python-pbr
BuildRequires: python2-setuptools
BuildRequires: python2-pbr
Requires: python-keystoneauth1 >= 3.1.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-utils >= 3.20.0
Requires: python-pbr
Requires: python-prettytable
Requires: pyOpenSSL >= 0.14
Requires: python-requests
Requires: python-six >= 1.9.0
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}
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.
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{sname}
@ -62,52 +68,48 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr
Requires: python3-keystoneauth1 >= 3.1.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-utils >= 3.20.0
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 >= 0.14
Requires: python3-pyOpenSSL >= 17.1.0
Requires: python3-requests
Requires: python3-six >= 1.9.0
Requires: python3-six >= 1.10.0
Requires: python3-warlock
Requires: python3-wrapt
%description -n python3-%{sname}
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.
%{common_desc}
%endif
%if 0%{?with_doc}
%package doc
Summary: Documentation for OpenStack Glance API Client
BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
BuildRequires: python-keystoneauth1
BuildRequires: python-oslo-utils
BuildRequires: python-prettytable
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
BuildRequires: pyOpenSSL >= 0.14
%endif
%description doc
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.
%{common_desc}
This package contains auto-generated documentation.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%endif
%prep
%autosetup -n %{name}-%{upstream_version} -S git
rm -rf test-requirements.txt
%py_req_cleanup
%build
export PBR_VERSION=%{version}
@ -127,6 +129,7 @@ ln -s ./glance-%{python3_version} %{buildroot}%{_bindir}/glance-3
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
@ -136,7 +139,6 @@ 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
install -p -D -m 500 %{SOURCE1} %{buildroot}/sbin/image-backup
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
@ -144,13 +146,15 @@ install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/glanceclient/tests
export PYTHONPATH="$( pwd ):$PYTHONPATH"
sphinx-build -b html doc/source html
%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 man
install -p -D -m 644 man/glance.1 %{buildroot}%{_mandir}/man1/glance.1
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
# prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
@ -162,8 +166,9 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
%{python2_sitelib}/glanceclient
%{python2_sitelib}/*.egg-info
%{_sysconfdir}/bash_completion.d
%if 0%{?with_doc}
%{_mandir}/man1/glance.1.gz
"/sbin/image-backup"
%endif
%{_bindir}/glance
%{_bindir}/glance-2
%{_bindir}/glance-%{python2_version}
@ -180,9 +185,17 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
%{_bindir}/glance-%{python3_version}
%endif
%if 0%{?with_doc}
%files doc
%doc html
%doc doc/build/html
%license LICENSE
%endif
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
@ -197,6 +210,12 @@ Contains python wheels for %{name}
/wheels/*
%changelog
* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 1:2.8.0-1
- Update to 2.8.0
* 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

190
openstack/python-glanceclient/centos/python-glanceclient.spec.orig Normal file
View File

@ -0,0 +1,190 @@
%{!?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

6
openstack/python-gnocchiclient/centos/build_srpm.data
View File

@ -1,5 +1,3 @@
VERSION=7.0.1
TAR_NAME=gnocchiclient
COPY_LIST="$CGCS_BASE/downloads/$TAR_NAME-$VERSION.tar.gz"
TIS_PATCH_VER=1
SRC_DIR=$CGCS_BASE/git/python-gnocchiclient
TIS_PATCH_VER=0

48
openstack/python-gnocchiclient/centos/python-gnocchiclient.spec
View File

@ -14,14 +14,17 @@ 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.1
Version: 7.0.4
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
@ -37,15 +40,15 @@ BuildRequires: python2-devel
BuildRequires: python2-pbr
BuildRequires: python2-tools
Requires: python-cliff >= 1.16.0
Requires: python2-osc-lib >= 1.7.0
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: python-dateutil
Requires: python2-dateutil
Requires: python2-debtcollector
%if 0%{?fedora} || 0%{?rhel} > 7
Requires: python2-monotonic
@ -62,9 +65,7 @@ Summary: Documentation for OpenStack Gnocchi API Client
Group: Documentation
BuildRequires: python2-sphinx
BuildRequires: python2-oslo-sphinx
BuildRequires: python2-openstack-doc-tools
BuildRequires: python-cliff
BuildRequires: python2-cliff >= 2.10
BuildRequires: python2-keystoneauth1
BuildRequires: python2-six
BuildRequires: python2-futurist
@ -74,7 +75,7 @@ BuildRequires: python2-sphinx_rtd_theme
BuildRequires: python2-babel
# Runtime requirements needed during documentation build
BuildRequires: python2-osc-lib
BuildRequires: python-dateutil
BuildRequires: python2-dateutil
%description doc
%{common_desc}
@ -99,8 +100,8 @@ BuildRequires: python3-pbr
BuildRequires: python3-setuptools
BuildRequires: python3-tools
Requires: python3-cliff >= 1.16.0
Requires: python3-osc-lib >= 1.7.0
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
@ -126,14 +127,9 @@ Requires: python3-%{pypi_name} = %{version}-%{release}
%description
%{common_desc}
%package sdk
Summary: SDK files for %{pypi_name}
%description sdk
Contains SDK files for %{pypi_name} package
%prep
%autosetup -n %{pypi_name}-%{upstream_version} -S git
%autosetup -p1 -n %{pypi_name}-%{upstream_version}
%if 0%{?with_python3}
rm -rf %{py3dir}
@ -145,7 +141,7 @@ cp -a . %{py3dir}
rm -rf gnocchiclient.egg-info
# Let RPM handle the requirements
rm -f test-requirements.txt
rm -f {,test-}requirements.txt
%build
export PBR_VERSION=%{version}
@ -168,9 +164,11 @@ 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}
@ -185,7 +183,6 @@ done
popd
# Some env variables required to successfully build our doc
export PATH=$PATH:%{buildroot}%{_bindir}
export PYTHONPATH=.
export LANG=en_US.utf8
python setup.py build_sphinx -b html
@ -197,6 +194,7 @@ rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version}
%files -n python2-%{pypi_name}
%doc README.rst
%license LICENSE
@ -230,6 +228,12 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --excl
%files -n python-%{pypi_name}-doc
%doc doc/build/html
%package sdk
Summary: SDK files for %{pypi_name}
%description sdk
Contains SDK files for %{pypi_name} package
%files sdk
/usr/share/remote-clients/%{pypi_name}-%{version}.tgz
@ -242,6 +246,8 @@ Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Tue Feb 13 2018 RDO <dev@lists.rdoproject.org> 7.0.1-1
- Update to 7.0.1
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 7.0.4-1
- Update to 7.0.4

220
openstack/python-gnocchiclient/centos/python-gnocchiclient.spec.orig Normal file
View File

@ -0,0 +1,220 @@
%{!?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

2
openstack/python-heat/openstack-heat/centos/openstack-heat.spec
View File

@ -87,7 +87,6 @@ BuildRequires: python-saharaclient
BuildRequires: python-neutronclient
BuildRequires: python-swiftclient
BuildRequires: python-heatclient
BuildRequires: python-ceilometerclient
BuildRequires: python-glanceclient
BuildRequires: python-troveclient
BuildRequires: python-aodhclient
@ -277,7 +276,6 @@ Requires: python-oslo-service
Requires: python-oslo-log
Requires: python-oslo-versionedobjects
Requires: python-ceilometerclient
Requires: python-cinderclient
Requires: python-glanceclient
Requires: python-heatclient

5
openstack/python-heatclient/centos/build_srpm.data
View File

@ -1 +1,4 @@
TIS_PATCH_VER=3
TAR_NAME=python-heatclient
SRC_DIR=$CGCS_BASE/git/python-heatclient
TIS_PATCH_VER=0

25
openstack/python-heatclient/centos/meta_patches/0001-Update-package-versioning-format-for-TiS-format.patch
View File

@ -1,25 +0,0 @@
From 001aa3b51766fb3b2cbb0c9a0c715650ef394f8c Mon Sep 17 00:00:00 2001
From: Al Bailey <al.bailey@windriver.com>
Date: Mon, 30 Jan 2017 12:24:46 -0500
Subject: [PATCH 1/2] Update package versioning format for Titanium Cloud format
---
SPECS/python-heatclient.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/python-heatclient.spec b/SPECS/python-heatclient.spec
index 73a1c6f..7d6d32f 100644
--- a/SPECS/python-heatclient.spec
+++ b/SPECS/python-heatclient.spec
@@ -8,7 +8,7 @@
Name: python-heatclient
Version: 1.11.1
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Heat
License: ASL 2.0
--
1.8.3.1

51
openstack/python-heatclient/centos/meta_patches/0002-Packages-sdk-for-remote-clients.patch
View File

@ -1,51 +0,0 @@
From e3f1154184f24103942c98fa9373763df49703c7 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 14:32:49 -0400
Subject: WRS: 0002-Packages-sdk-for-remote-clients.patch
---
SPECS/python-heatclient.spec | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/SPECS/python-heatclient.spec b/SPECS/python-heatclient.spec
index c5ff419..1f44763 100644
--- a/SPECS/python-heatclient.spec
+++ b/SPECS/python-heatclient.spec
@@ -92,6 +92,13 @@ the OpenStack Heat API.
This package contains auto-generated documentation.
+%package sdk
+Summary: SDK files for %{name}
+
+%description sdk
+Contains SDK files for %{name} package
+
+
%prep
%autosetup -n %{name}-%{upstream_version} -S git
@@ -128,6 +135,10 @@ install -pm 644 tools/heat.bash_completion \
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/heatclient/tests
+# prep SDK package
+mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
+tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
+
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
@@ -164,6 +175,9 @@ install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1
%doc doc/build/html
%license LICENSE
+%files sdk
+/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
+
%changelog
* Mon Oct 30 2017 rdo-trunk <javier.pena@redhat.com> 1.11.1-1
- Update to 1.11.1
--
2.7.4

37
openstack/python-heatclient/centos/meta_patches/0003-Apply-timezone-support-patch.patch
View File

@ -1,37 +0,0 @@
From 2d0e1e8effaf3c83e137af5a79eb62f3e312bd94 Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 26 Oct 2017 08:56:39 -0500
Subject: [PATCH] WRS: 0003-Apply-timezone-support-patch.patch
---
SPECS/python-heatclient.spec | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/SPECS/python-heatclient.spec b/SPECS/python-heatclient.spec
index 1f44763..12ce333 100644
--- a/SPECS/python-heatclient.spec
+++ b/SPECS/python-heatclient.spec
@@ -15,6 +15,12 @@ License: ASL 2.0
URL: https://launchpad.net/python-heatclientclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+# WRS.
+Patch0001: 0001-timezone-support-for-heatclient.patch
+
+# BuildArch needs to be located below patches in the spec file
+
+
BuildArch: noarch
%description
@@ -101,6 +107,7 @@ Contains SDK files for %{name} package
%prep
%autosetup -n %{name}-%{upstream_version} -S git
+# autosetup applies all patches automatically
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
--
1.8.3.1

3
openstack/python-heatclient/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +0,0 @@
0001-Update-package-versioning-format-for-TiS-format.patch
0002-Packages-sdk-for-remote-clients.patch
0003-Apply-timezone-support-patch.patch

224
openstack/python-heatclient/centos/patches/0001-timezone-support-for-heatclient.patch
View File

@ -1,224 +0,0 @@
From d144d6cfe42d8af42106f709114fd707afcfaede Mon Sep 17 00:00:00 2001
From: Litao Gao <litao.gao@windriver.com>
Date: Fri, 24 Mar 2017 04:34:54 -0400
Subject: [PATCH 1/1] timezone support for heatclient
---
heatclient/common/utils.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++
heatclient/v1/shell.py | 18 +++++++++++++++++
2 files changed, 66 insertions(+)
diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py
index f2b20f1..9f2767f 100644
--- a/heatclient/common/utils.py
+++ b/heatclient/common/utils.py
@@ -18,6 +18,14 @@ import logging
import os
import textwrap
import uuid
+import sys
+import re
+
+from functools import wraps
+from cStringIO import StringIO
+from datetime import datetime
+import dateutil
+from dateutil import parser
from oslo_serialization import jsonutils
from oslo_utils import encodeutils
@@ -447,3 +455,43 @@ def get_response_body(resp):
else:
body = None
return body
+
+
+def parse_date(string_data):
+ """Parses a date-like input string into a timezone aware Python
+ datetime.
+ """
+ pattern = r'(\d{4}-\d{2}-\d{2}[T ])?\d{2}:\d{2}:\d{2}(\.\d{6})?Z?'
+
+ def convert_date(matchobj):
+ formats = ["%Y-%m-%dT%H:%M:%S.%f", "%Y-%m-%d %H:%M:%S.%f",
+ "%Y-%m-%dT%H:%M:%S", "%Y-%m-%d %H:%M:%S",
+ "%Y-%m-%dT%H:%M:%SZ", "%H:%M:%S"]
+ datestring = matchobj.group(0)
+ if datestring:
+ for format in formats:
+ try:
+ datetime.strptime(datestring, format)
+ datestring += "+0000"
+ parsed = parser.parse(datestring)
+ converted = parsed.astimezone(dateutil.tz.tzlocal())
+ return datetime.strftime(converted, format)
+ except Exception:
+ pass
+ return datestring
+
+ return re.sub(pattern, convert_date, str(string_data))
+
+
+def timestamp_converter(display):
+ """
+ Decorator that parse the timestamp and convert according timezone
+ """
+ @wraps(display)
+ def new_f(*args, **kwargs):
+ sys.stdout = mystdout = StringIO()
+ display(*args, **kwargs)
+ sys.stdout = sys.__stdout__
+ content = mystdout.getvalue()
+ print parse_date(content)
+ return new_f
diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index ac4ecb9..d8c8324 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -43,6 +43,7 @@ def show_deprecated(deprecated, recommended):
)
+@utils.timestamp_converter
@utils.arg('-f', '--template-file', metavar='<FILE>',
help=_('Path to the template.'))
@utils.arg('-e', '--environment-file', metavar='<FILE or URL>',
@@ -412,6 +413,7 @@ def do_action_check(hc, args):
do_stack_list(hc)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to describe.'))
@utils.arg('--no-resolve-outputs', action="store_true",
@@ -590,6 +592,7 @@ def do_stack_cancel_update(hc, args):
do_stack_list(hc)
+@utils.timestamp_converter
@utils.arg('-s', '--show-deleted', default=False, action="store_true",
help=_('Include soft-deleted stacks in the stack listing.'))
@utils.arg('-n', '--show-nested', default=False, action="store_true",
@@ -700,6 +703,7 @@ def do_stack_list(hc, args=None):
utils.print_list(stacks, fields, sortby_index=sortby_index)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to query.'))
def do_output_list(hc, args):
@@ -861,6 +865,7 @@ def do_resource_type_template(hc, args):
print(utils.format_output(template))
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to get the template for.'))
def do_template_show(hc, args):
@@ -934,6 +939,7 @@ def do_template_validate(hc, args):
print(jsonutils.dumps(validation, indent=2, ensure_ascii=False))
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to show the resources for.'))
@utils.arg('-n', '--nested-depth', metavar='<DEPTH>',
@@ -975,6 +981,7 @@ def do_resource_list(hc, args):
utils.print_list(resources, fields, sortby_index=4)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to show the resource for.'))
@utils.arg('resource', metavar='<RESOURCE>',
@@ -1140,6 +1147,7 @@ def do_hook_clear(hc, args):
hook_type, resource_pattern)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to show the events for.'))
@utils.arg('-r', '--resource', metavar='<RESOURCE>',
@@ -1263,6 +1271,7 @@ def do_event(hc, args):
do_event_show(hc, args)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to show the events for.'))
@utils.arg('resource', metavar='<RESOURCE>',
@@ -1290,6 +1299,7 @@ def do_event_show(hc, args):
utils.print_dict(event.to_dict(), formatters=formatters)
+@utils.timestamp_converter
@utils.arg('-f', '--definition-file', metavar='<FILE or URL>',
help=_('Path to JSON/YAML containing map defining '
'<inputs>, <outputs>, and <options>.'))
@@ -1360,6 +1370,7 @@ def do_config_list(hc, args):
utils.print_list(scs, fields, sortby_index=None)
+@utils.timestamp_converter
@utils.arg('id', metavar='<ID>',
help=_('ID of the config.'))
@utils.arg('-c', '--config-only', default=False, action="store_true",
@@ -1480,6 +1491,7 @@ def do_deployment_list(hc, args):
utils.print_list(deployments, fields, sortby_index=5)
+@utils.timestamp_converter
@utils.arg('id', metavar='<ID>',
help=_('ID of the deployment.'))
def do_deployment_show(hc, args):
@@ -1495,6 +1507,7 @@ def do_deployment_show(hc, args):
print(jsonutils.dumps(sd.to_dict(), indent=2))
+@utils.timestamp_converter
@utils.arg('id', metavar='<ID>',
help=_('ID of the server to fetch deployments for.'))
def do_deployment_metadata_show(hc, args):
@@ -1540,6 +1553,7 @@ def do_deployment_delete(hc, args):
{'count': failure_count, 'total': len(args.id)})
+@utils.timestamp_converter
@utils.arg('id', metavar='<ID>',
help=_('ID deployment to show the output for.'))
@utils.arg('output', metavar='<OUTPUT NAME>', nargs='?', default=None,
@@ -1594,6 +1608,7 @@ def do_build_info(hc, args):
utils.print_dict(result, formatters=formatters)
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of stack to snapshot.'))
@utils.arg('-n', '--name', metavar='<NAME>',
@@ -1613,6 +1628,7 @@ def do_stack_snapshot(hc, args):
print(jsonutils.dumps(snapshot, indent=2, ensure_ascii=False))
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of the stack containing the snapshot.'))
@utils.arg('snapshot', metavar='<SNAPSHOT>',
@@ -1681,6 +1697,7 @@ def do_stack_restore(hc, args):
raise exc.CommandError(_('Stack or snapshot not found'))
+@utils.timestamp_converter
@utils.arg('id', metavar='<NAME or ID>',
help=_('Name or ID of the stack containing the snapshots.'))
def do_snapshot_list(hc, args):
@@ -1704,6 +1721,7 @@ def do_snapshot_list(hc, args):
utils.print_list(snapshots["snapshots"], fields, formatters=formatters)
+@utils.timestamp_converter
def do_service_list(hc, args=None):
'''List the Heat engines.'''
show_deprecated('heat service-list',
--
1.8.3.1

230
openstack/python-heatclient/centos/python-heatclient.spec Normal file
View File

@ -0,0 +1,230 @@
%{!?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.16.1
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/
# STX: prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%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 sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
%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

185
openstack/python-heatclient/centos/python-heatclient.spec.orig Normal file
View File

@ -0,0 +1,185 @@
%{!?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

2
openstack/python-heatclient/centos/srpm_path
View File

@ -1,2 +0,0 @@
mirror:Source/python-heatclient-1.11.1-1.el7.src.rpm

70
openstack/python-horizon/centos/files/0001-Remove-WRS-imports-from-novaclient.patch Normal file
View File

@ -0,0 +1,70 @@
diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py
index 39a7684..e6798e9 100755
--- a/openstack_dashboard/api/nova.py
+++ b/openstack_dashboard/api/nova.py
@@ -38,10 +38,6 @@ from novaclient.v2 import instance_action as nova_instance_action
from novaclient.v2 import list_extensions as nova_list_extensions
from novaclient.v2 import servers as nova_servers
-# Todo (ediardo): move all wrs* and func wrappers into stx-gui
-from novaclient.v2 import wrs_pci
-from novaclient.v2 import wrs_providernets
-
from horizon import exceptions
from horizon import exceptions as horizon_exceptions
from horizon.utils import functions as utils
@@ -1123,54 +1119,6 @@ def requires_keypair():
return features.get('requires_keypair', False)
-# WRS: Nova extension for provider network.
-@profiler.trace
-def provider_network_get(request, providernet_id):
- return wrs_providernets.ProviderNetsManager(novaclient(request)).get(
- providernet_id)
-
-
-# WRS: Nova extension for device usage
-@profiler.trace
-class DeviceUsage(base.APIResourceWrapper):
- """Wrapper for Inventory Device Usage"""
- _attrs = ['device_name', 'device_id', 'vendor_id', 'class_id',
- 'pci_vfs_configured', 'pci_vfs_used',
- 'pci_pfs_configured', 'pci_pfs_used']
-
-
-@profiler.trace
-def get_device_usage_list(request):
- usages = wrs_pci.PciDevicesManager(novaclient(request)).list()
- return [DeviceUsage(n) for n in usages]
-
-
-@profiler.trace
-def get_device_usage(request, device_id):
- if device_id is None:
- raise nova_exceptions.ResourceNotFound
-
- usage = wrs_pci.PciDevicesManager(novaclient(request)).list(
- device=device_id)
- return DeviceUsage(usage[0])
-
-
-# WRS: Nova extension for detail device usage
-@profiler.trace
-class DetailUsage(base.APIResourceWrapper):
- """Wrapper for Inventory Device Usage"""
- _attrs = ['host',
- 'pci_vfs_configured', 'pci_vfs_used',
- 'pci_pfs_configured', 'pci_pfs_used']
-
-
-@profiler.trace
-def get_detail_usage(request, device_id):
- usages = wrs_pci.PciDevicesManager(novaclient(request)).get(
- device_id)
- return [DetailUsage(n) for n in usages]
-
-
def can_set_quotas():
features = getattr(settings, 'OPENSTACK_HYPERVISOR_FEATURES', {})
return features.get('enable_quotas', True)

3
openstack/python-horizon/centos/python-django-horizon.spec
View File

@ -30,6 +30,8 @@ Source12: horizon-region-exclusions.csv
Source13: guni_config.py
Source14: horizon-assets-compress
Patch1: 0001-Remove-WRS-imports-from-novaclient.patch
#
# BuildArch needs to be located below patches in the spec file. Don't ask!
#
@ -247,6 +249,7 @@ Customization module for OpenStack Dashboard to provide a branded logo.
%prep
%autosetup -n horizon-%{upstream_version} -S git
# autosetup automatically applies the patches
# STX remove troublesome files introduced by tox
rm -f openstack_dashboard/test/.secret_key_store

4
openstack/python-ironicclient/centos/build_srpm.data
View File

@ -1,5 +1,3 @@
TAR_NAME="python-ironicclient"
SRC_DIR="$CGCS_BASE/git/python-ironicclient"
TIS_BASE_SRCREV=096834f09ae5d8cabc8c0b1ccbac271ddb13e2ee
TIS_PATCH_VER=1
TIS_PATCH_VER=0

69
openstack/python-ironicclient/centos/python-ironicclient.spec
View File

@ -6,9 +6,11 @@
%global sname ironicclient
%global common_desc A python and command line client library for Ironic
Name: python-ironicclient
Version: 1.17.0
Release: 0%{?_tis_dist}.%{tis_patch_ver}
Version: 2.5.0
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python client for Ironic
License: ASL 2.0
@ -18,38 +20,42 @@ BuildArch: noarch
%description
A python and command line client library for Ironic.
%{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
BuildRequires: python-pbr >= 2.0.0
BuildRequires: python-setuptools
Requires: python-appdirs >= 1.3.0
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-httplib2
Requires: python-jsonschema
Requires: python-openstackclient >= 3.3.0
Requires: python-keystoneauth1 >= 3.1.0
Requires: python-pbr >= 2.0.0
Requires: python-prettytable
Requires: python-six >= 1.9.0
Requires: python-osc-lib >= 1.7.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.20.0
Requires: python-requests
Requires: PyYAML
%endif
%{?python_provide:%python_provide python2-%{sname}}
%description -n python2-%{sname}
A python and command line client library for Ironic
%{common_desc}
%if 0%{?with_python3}
@ -62,24 +68,22 @@ BuildRequires: python3-setuptools
Requires: python3-appdirs >= 1.3.0
Requires: python3-dogpile-cache >= 0.6.2
Requires: python3-httplib2
Requires: python3-jsonschema
Requires: python3-openstackclient >= 3.3.0
Requires: python3-keystoneauth1 >= 3.1.0
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-pbr >= 2.0.0
Requires: python3-prettytable
Requires: python3-six >= 1.9.0
Requires: python3-osc-lib >= 1.7.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.20.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-requests
Requires: python3-PyYAML
%{?python_provide:%python_provide python3-%{sname}}
%description -n python3-%{sname}
A python and command line client library for Ironic
%{common_desc}
%endif
%prep
@ -112,11 +116,10 @@ ln -s ./ironic-%{python2_version} %{buildroot}%{_bindir}/ironic-2
ln -s ./ironic-2 %{buildroot}%{_bindir}/ironic
install -p -D -m 644 tools/ironic.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ironic.bash_completion
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
%files -n python2-%{sname}
%doc README.rst
%license LICENSE
@ -125,7 +128,6 @@ install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
%{_bindir}/ironic-%{python2_version}
%{python2_sitelib}/ironicclient*
%{python2_sitelib}/python_ironicclient*
%{_sysconfdir}/bash_completion.d/ironic.bash_completion
%if 0%{?with_python3}
%files -n python3-%{sname}
@ -148,9 +150,6 @@ Contains python wheels for %{name}
%changelog
* Wed Sep 06 2017 rdo-trunk <javier.pena@redhat.com> 1.17.0-1
- Update to 1.17.0
* Mon Aug 14 2017 Alfredo Moralejo <amoralej@redhat.com> 1.16.0-1
- Update to 1.16.0
* Fri Aug 10 2018 RDO <dev@lists.rdoproject.org> 2.5.0-1
- Update to 2.5.0

138
openstack/python-ironicclient/centos/python-ironicclient.spec.orig Normal file
View File

@ -0,0 +1,138 @@
%{!?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

5
openstack/python-keystoneclient/centos/build_srpm.data
View File

@ -1 +1,4 @@
TIS_PATCH_VER=7
TAR_NAME=python-keystoneclient
SRC_DIR=$CGCS_BASE/git/python-keystoneclient
TIS_PATCH_VER=0

13
openstack/python-keystoneclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,13 +0,0 @@
diff --git a/SPECS/python-keystoneclient.spec b/SPECS/python-keystoneclient.spec
index 79ab30f..e68bc6f 100644
--- a/SPECS/python-keystoneclient.spec
+++ b/SPECS/python-keystoneclient.spec
@@ -8,7 +8,7 @@
Name: python-keystoneclient
Epoch: 1
Version: 3.13.0
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for OpenStack Identity API
License: ASL 2.0
URL: https://launchpad.net/python-keystoneclient

16
openstack/python-keystoneclient/centos/meta_patches/0002-meta-public-adminURL-detection.patch
View File

@ -1,16 +0,0 @@
diff --git a/SPECS/python-keystoneclient.spec b/SPECS/python-keystoneclient.spec
index e68bc6f..c71629d 100644
--- a/SPECS/python-keystoneclient.spec
+++ b/SPECS/python-keystoneclient.spec
@@ -14,6 +14,11 @@ License: ASL 2.0
URL: https://launchpad.net/python-keystoneclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
+# WRS
+Patch0001: internal-keystone-client-public-adminURL-detection.patch
+
+# BuildArch needs to be located below patches in the spec file
+
BuildArch: noarch
BuildRequires: /usr/bin/openssl

47
openstack/python-keystoneclient/centos/meta_patches/0003-meta-TiS-remote-client-sdk-patch.patch
View File

@ -1,47 +0,0 @@
diff --git a/SPECS/python-keystoneclient.spec b/SPECS/python-keystoneclient.spec
index 2844d30..edd6720 100644
--- a/SPECS/python-keystoneclient.spec
+++ b/SPECS/python-keystoneclient.spec
@@ -167,6 +167,12 @@ BuildRequires: python-openstackdocstheme
%description doc
Documentation for the keystoneclient module
+%package sdk
+Summary: SDK files for %{name}
+
+%description sdk
+Contains SDK files for %{name} package
+
%prep
%autosetup -n %{name}-%{upstream_version} -S git
@@ -194,6 +200,10 @@ rm -rf {test-,}requirements.txt
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.{doctrees,buildinfo}
+# prep SDK package
+mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
+tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
+
%check
%{__python2} setup.py test
@@ -202,6 +212,7 @@ rm -fr .testrepository
%{__python3} setup.py test
%endif
+
%files -n python2-keystoneclient
%license LICENSE
%doc README.rst
@@ -232,6 +243,10 @@ rm -fr .testrepository
%{python3_sitelib}/keystoneclient/tests
%endif
+%files sdk
+/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
+
+
%changelog
* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 1:3.13.0-1
- Update to 3.13.0

13
openstack/python-keystoneclient/centos/meta_patches/0004-meta-dont-remove-requirements-txt.patch
View File

@ -1,13 +0,0 @@
diff --git a/SPECS/python-keystoneclient.spec b/SPECS/python-keystoneclient.spec
index edd6720..a41311e 100644
--- a/SPECS/python-keystoneclient.spec
+++ b/SPECS/python-keystoneclient.spec
@@ -181,7 +181,7 @@ Contains SDK files for %{name} package
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
# Let RPM handle the dependencies
-rm -rf {test-,}requirements.txt
+rm -f test-requirements.txt
%build
%py2_build

20
openstack/python-keystoneclient/centos/meta_patches/0006-meta-buildrequires-python-setuptools_scm.patch
View File

@ -1,20 +0,0 @@
diff --git a/SPECS/python-keystoneclient.spec b/SPECS/python-keystoneclient.spec
index 965c437..efc0c4b 100644
--- a/SPECS/python-keystoneclient.spec
+++ b/SPECS/python-keystoneclient.spec
@@ -34,6 +34,7 @@ Summary: Client library for OpenStack Identity API
BuildRequires: python2-devel
BuildRequires: python-setuptools
+BuildRequires: python2-setuptools_scm
BuildRequires: python-pbr >= 2.0.0
BuildRequires: git
@@ -61,6 +62,7 @@ Summary: Client library for OpenStack Identity API
BuildRequires: python3-devel
BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools_scm
BuildRequires: python3-pbr >= 2.0.0
Requires: python3-oslo-config >= 2:4.0.0

5
openstack/python-keystoneclient/centos/meta_patches/PATCH_ORDER
View File

@ -1,5 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-meta-public-adminURL-detection.patch
0003-meta-TiS-remote-client-sdk-patch.patch
0004-meta-dont-remove-requirements-txt.patch
0006-meta-buildrequires-python-setuptools_scm.patch

55
openstack/python-keystoneclient/centos/patches/internal-keystone-client-public-adminURL-detection.patch
View File

@ -1,55 +0,0 @@
From e9d61bd41cfbe8cf424d13052c35f298f5beb1e2 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 24 Jan 2017 15:19:33 -0500
Subject: [PATCH] TiS-remote-client-sdk-patch
---
keystoneclient/v2_0/client.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py
index 904f769..003c5b1 100644
--- a/keystoneclient/v2_0/client.py
+++ b/keystoneclient/v2_0/client.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import os
import logging
import warnings
@@ -30,6 +31,9 @@ from keystoneclient.v2_0 import tenants
from keystoneclient.v2_0 import tokens
from keystoneclient.v2_0 import users
+import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+from requests.packages.urllib3 import disable_warnings as urllib3_disable_warnings
_logger = logging.getLogger(__name__)
@@ -154,6 +158,20 @@ class Client(httpclient.HTTPClient):
'deprecated as of the 1.7.0 release and may be removed in '
'the 2.0.0 release.', DeprecationWarning)
+ # NOTE(knasim-wrs): As per US76645, the Keystone adminURL
+ # is no longer an internal address since it needs to be
+ # accessible via remote Openstack client. Things get
+ # complicated with HTTPS where the internal keystone client
+ # gets this adminURL and cannot connect to Keystone server
+ # as it cannot verify the SSL certificate.
+ # We will check for this condition here, if OS_ENDPOINT_TYPE
+ # is not publicURL then this is an internal access scenario and
+ # Keystone client will be set to SSL insecure mode
+ if os.environ.get('OS_ENDPOINT_TYPE') == 'internalURL':
+ kwargs['insecure'] = True
+ # disable verbose insecurity warnings
+ urllib3_disable_warnings(InsecureRequestWarning)
+
super(Client, self).__init__(**kwargs)
self.certificates = certificates.CertificatesManager(self._adapter)
--
1.8.3.1

278
openstack/python-keystoneclient/centos/python-keystoneclient.spec Normal file
View File

@ -0,0 +1,278 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%if 0%{?fedora}
%global with_python3 1
%endif
%global common_desc \
Client library and command line utility for interacting with Openstack \
Identity API.
Name: python-keystoneclient
Epoch: 1
Version: 3.17.0
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for OpenStack Identity API
License: ASL 2.0
URL: https://launchpad.net/python-keystoneclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: /usr/bin/openssl
%description
%{common_desc}
%package -n python2-keystoneclient
Summary: Client library for OpenStack Identity API
%{?python_provide:%python_provide python2-keystoneclient}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python2-pbr >= 2.0.0
BuildRequires: git
Requires: python2-oslo-config >= 2:5.2.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 >= 2.14.2
Requires: python2-six >= 1.10.0
Requires: python2-stevedore >= 1.20.0
Requires: python2-pbr >= 2.0.0
Requires: python2-debtcollector >= 1.2.0
Requires: python2-keystoneauth1 >= 3.4.0
%if 0%{?fedora} > 0
Requires: python2-keyring >= 5.5.1
%else
Requires: python-keyring >= 5.5.1
%endif
%description -n python2-keystoneclient
%{common_desc}
%if 0%{?with_python3}
%package -n python3-keystoneclient
Summary: Client library for OpenStack Identity API
%{?python_provide:%python_provide python3-keystoneclient}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr >= 2.0.0
Requires: python3-oslo-config >= 2:5.2.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 >= 2.14.2
Requires: python3-six >= 1.10.0
Requires: python3-stevedore >= 1.20.0
Requires: python3-pbr >= 2.0.0
Requires: python3-debtcollector >= 1.2.0
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-keyring >= 5.5.1
%description -n python3-keystoneclient
Client library for interacting with Openstack Identity API.
%endif
%package -n python2-keystoneclient-tests
Summary: python2-keystoneclient test subpackage
Requires: python2-keystoneclient = %{epoch}:%{version}-%{release}
BuildRequires: python2-hacking
BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-oauthlib
BuildRequires: python2-oslotest
BuildRequires: python2-testtools
BuildRequires: python2-keystoneauth1
BuildRequires: python2-oslo-config
BuildRequires: python2-oslo-utils
BuildRequires: python2-oslo-serialization
BuildRequires: python2-oslo-i18n
BuildRequires: python2-stestr
BuildRequires: python2-testresources
BuildRequires: python2-testscenarios
%if 0%{?fedora} > 0
BuildRequires: python2-keyring >= 5.5.1
BuildRequires: python2-lxml
BuildRequires: python2-requests-mock
%else
BuildRequires: python-keyring >= 5.5.1
BuildRequires: python-lxml
BuildRequires: python-requests-mock
%endif
Requires: python2-hacking
Requires: python2-fixtures
Requires: python2-mock
Requires: python2-oauthlib
Requires: python2-oslotest
Requires: python2-stestr
Requires: python2-testtools
Requires: python2-testresources
Requires: python2-testscenarios
%if 0%{?fedora} > 0
Requires: python2-lxml
Requires: python2-requests-mock
%else
Requires: python-lxml
Requires: python-requests-mock
%endif
%description -n python2-keystoneclient-tests
python2-keystoneclient test subpackages
%if 0%{?with_python3}
%package -n python3-keystoneclient-tests
Summary: python3-keystoneclient test subpackage
Requires: python3-keystoneclient = %{epoch}:%{version}-%{release}
BuildRequires: python3-hacking
BuildRequires: python3-fixtures
BuildRequires: python3-keyring >= 5.5.1
BuildRequires: python3-lxml
BuildRequires: python3-mock
BuildRequires: python3-oauthlib
BuildRequires: python3-oslotest
BuildRequires: python3-requests-mock
BuildRequires: python3-testresources
BuildRequires: python3-testscenarios
BuildRequires: python3-testtools
BuildRequires: python3-keystoneauth1
BuildRequires: python3-oslo-config
BuildRequires: python3-oslo-utils
BuildRequires: python3-oslo-serialization
BuildRequires: python3-oslo-i18n
BuildRequires: python3-stestr
Requires: python3-hacking
Requires: python3-fixtures
Requires: python3-lxml
Requires: python3-mock
Requires: python3-oauthlib
Requires: python3-oslotest
Requires: python3-requests-mock
Requires: python3-stestr
Requires: python3-testresources
Requires: python3-testscenarios
Requires: python3-testtools
%description -n python3-keystoneclient-tests
python3-keystoneclient test subpackages
%endif
%package doc
Summary: Documentation for OpenStack Keystone API client
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
%description doc
Documentation for the keystoneclient module
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# disable warning-is-error, this project has intersphinx in docs
# so some warnings are generated in network isolated build environment
# as koji
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
# Let RPM handle the dependencies
rm -rf {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}
%py2_install
%if 0%{?with_python3}
%py3_install
%endif
# Build HTML docs
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.{doctrees,buildinfo}
# STX: stage wheels
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
# STX: prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%check
stestr --test-path=./keystoneclient/tests/unit run
%if 0%{?with_python3}
stestr-3 --test-path=./keystoneclient/tests/unit run
%endif
%files -n python2-keystoneclient
%license LICENSE
%doc README.rst
%{python2_sitelib}/keystoneclient
%{python2_sitelib}/*.egg-info
%exclude %{python2_sitelib}/keystoneclient/tests
%if 0%{?with_python3}
%files -n python3-keystoneclient
%license LICENSE
%doc README.rst
%{python3_sitelib}/keystoneclient
%{python3_sitelib}/*.egg-info
%exclude %{python3_sitelib}/keystoneclient/tests
%endif
%files doc
%doc doc/build/html
%license LICENSE
%files -n python2-keystoneclient-tests
%license LICENSE
%{python2_sitelib}/keystoneclient/tests
%if 0%{?with_python3}
%files -n python3-keystoneclient-tests
%license LICENSE
%{python3_sitelib}/keystoneclient/tests
%endif
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
%package wheels
Summary: %{name} wheels
%description wheels
Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 1:3.17.0-1
- Update to 3.17.0

247
openstack/python-keystoneclient/centos/python-keystoneclient.spec.orig Normal file
View File

@ -0,0 +1,247 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%if 0%{?fedora}
%global with_python3 1
%endif
%global common_desc \
Client library and command line utility for interacting with Openstack \
Identity API.
Name: python-keystoneclient
Epoch: 1
Version: 3.17.0
Release: 1%{?dist}
Summary: Client library for OpenStack Identity API
License: ASL 2.0
URL: https://launchpad.net/python-keystoneclient
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: /usr/bin/openssl
%description
%{common_desc}
%package -n python2-keystoneclient
Summary: Client library for OpenStack Identity API
%{?python_provide:%python_provide python2-keystoneclient}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pbr >= 2.0.0
BuildRequires: git
Requires: python2-oslo-config >= 2:5.2.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 >= 2.14.2
Requires: python2-six >= 1.10.0
Requires: python2-stevedore >= 1.20.0
Requires: python2-pbr >= 2.0.0
Requires: python2-debtcollector >= 1.2.0
Requires: python2-keystoneauth1 >= 3.4.0
%if 0%{?fedora} > 0
Requires: python2-keyring >= 5.5.1
%else
Requires: python-keyring >= 5.5.1
%endif
%description -n python2-keystoneclient
%{common_desc}
%if 0%{?with_python3}
%package -n python3-keystoneclient
Summary: Client library for OpenStack Identity API
%{?python_provide:%python_provide python3-keystoneclient}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr >= 2.0.0
Requires: python3-oslo-config >= 2:5.2.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 >= 2.14.2
Requires: python3-six >= 1.10.0
Requires: python3-stevedore >= 1.20.0
Requires: python3-pbr >= 2.0.0
Requires: python3-debtcollector >= 1.2.0
Requires: python3-keystoneauth1 >= 3.4.0
Requires: python3-keyring >= 5.5.1
%description -n python3-keystoneclient
Client library for interacting with Openstack Identity API.
%endif
%package -n python2-keystoneclient-tests
Summary: python2-keystoneclient test subpackage
Requires: python2-keystoneclient = %{epoch}:%{version}-%{release}
BuildRequires: python2-hacking
BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-oauthlib
BuildRequires: python2-oslotest
BuildRequires: python2-testtools
BuildRequires: python2-keystoneauth1
BuildRequires: python2-oslo-config
BuildRequires: python2-oslo-utils
BuildRequires: python2-oslo-serialization
BuildRequires: python2-oslo-i18n
BuildRequires: python2-stestr
BuildRequires: python2-testresources
BuildRequires: python2-testscenarios
%if 0%{?fedora} > 0
BuildRequires: python2-keyring >= 5.5.1
BuildRequires: python2-lxml
BuildRequires: python2-requests-mock
%else
BuildRequires: python-keyring >= 5.5.1
BuildRequires: python-lxml
BuildRequires: python-requests-mock
%endif
Requires: python2-hacking
Requires: python2-fixtures
Requires: python2-mock
Requires: python2-oauthlib
Requires: python2-oslotest
Requires: python2-stestr
Requires: python2-testtools
Requires: python2-testresources
Requires: python2-testscenarios
%if 0%{?fedora} > 0
Requires: python2-lxml
Requires: python2-requests-mock
%else
Requires: python-lxml
Requires: python-requests-mock
%endif
%description -n python2-keystoneclient-tests
python2-keystoneclient test subpackages
%if 0%{?with_python3}
%package -n python3-keystoneclient-tests
Summary: python3-keystoneclient test subpackage
Requires: python3-keystoneclient = %{epoch}:%{version}-%{release}
BuildRequires: python3-hacking
BuildRequires: python3-fixtures
BuildRequires: python3-keyring >= 5.5.1
BuildRequires: python3-lxml
BuildRequires: python3-mock
BuildRequires: python3-oauthlib
BuildRequires: python3-oslotest
BuildRequires: python3-requests-mock
BuildRequires: python3-testresources
BuildRequires: python3-testscenarios
BuildRequires: python3-testtools
BuildRequires: python3-keystoneauth1
BuildRequires: python3-oslo-config
BuildRequires: python3-oslo-utils
BuildRequires: python3-oslo-serialization
BuildRequires: python3-oslo-i18n
BuildRequires: python3-stestr
Requires: python3-hacking
Requires: python3-fixtures
Requires: python3-lxml
Requires: python3-mock
Requires: python3-oauthlib
Requires: python3-oslotest
Requires: python3-requests-mock
Requires: python3-stestr
Requires: python3-testresources
Requires: python3-testscenarios
Requires: python3-testtools
%description -n python3-keystoneclient-tests
python3-keystoneclient test subpackages
%endif
%package doc
Summary: Documentation for OpenStack Keystone API client
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
%description doc
Documentation for the keystoneclient module
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# disable warning-is-error, this project has intersphinx in docs
# so some warnings are generated in network isolated build environment
# as koji
sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg
# Let RPM handle the dependencies
rm -rf {test-,}requirements.txt
%build
%py2_build
%if 0%{?with_python3}
%py3_build
%endif
%install
%py2_install
%if 0%{?with_python3}
%py3_install
%endif
# Build HTML docs
%{__python2} setup.py build_sphinx -b html
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.{doctrees,buildinfo}
%check
stestr --test-path=./keystoneclient/tests/unit run
%if 0%{?with_python3}
stestr-3 --test-path=./keystoneclient/tests/unit run
%endif
%files -n python2-keystoneclient
%license LICENSE
%doc README.rst
%{python2_sitelib}/keystoneclient
%{python2_sitelib}/*.egg-info
%exclude %{python2_sitelib}/keystoneclient/tests
%if 0%{?with_python3}
%files -n python3-keystoneclient
%license LICENSE
%doc README.rst
%{python3_sitelib}/keystoneclient
%{python3_sitelib}/*.egg-info
%exclude %{python3_sitelib}/keystoneclient/tests
%endif
%files doc
%doc doc/build/html
%license LICENSE
%files -n python2-keystoneclient-tests
%license LICENSE
%{python2_sitelib}/keystoneclient/tests
%if 0%{?with_python3}
%files -n python3-keystoneclient-tests
%license LICENSE
%{python3_sitelib}/keystoneclient/tests
%endif
%changelog
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 1:3.17.0-1
- Update to 3.17.0

1
openstack/python-keystoneclient/centos/srpm_path
View File

@ -1 +0,0 @@
mirror:Source/python-keystoneclient-3.13.0-1.el7.src.rpm

144
openstack/python-keystoneclient/python-keystoneclient/CGCSkeyringsupport.patch
View File

@ -1,144 +0,0 @@
Index: git/keystoneclient/shell.py
===================================================================
--- git.orig/keystoneclient/shell.py 2014-09-17 13:06:07.761186569 -0400
+++ git/keystoneclient/shell.py 2014-09-22 15:10:36.326737219 -0400
@@ -24,6 +24,7 @@
from __future__ import print_function
+import os
import argparse
import getpass
import logging
@@ -32,6 +33,8 @@
import six
+import keyring
+
import keystoneclient
from keystoneclient import access
from keystoneclient.contrib.bootstrap import shell as shell_bootstrap
@@ -333,6 +336,11 @@
'--os-username or env[OS_USERNAME]')
if not args.os_password:
+ # priviledge check (only allow Keyring retrieval if we are root)
+ if os.geteuid() == 0:
+ args.os_password = keyring.get_password('CGCS', args.os_username)
+
+ if not args.os_password:
# No password, If we've got a tty, try prompting for it
if hasattr(sys.stdin, 'isatty') and sys.stdin.isatty():
# Check for Ctl-D
Index: git/keystoneclient/probe.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ git/keystoneclient/probe.py 2014-09-23 10:41:57.758412311 -0400
@@ -0,0 +1,106 @@
+#
+# Copyright (c) 2014 Wind River Systems, Inc.
+# SPDX-License-Identifier: Apache-2.0
+#
+#
+#
+#
+
+"""
+OCF sanity probe to prevent cleartext password
+"""
+
+import os
+import sys
+import json
+import urllib2
+import datetime
+import keyring
+import logging
+import logging.handlers
+
+_loggers = {}
+
+def get_logger(name):
+ """ Get a logger or create one """
+ if name not in _loggers:
+ _loggers[name] = logging.getLogger(name)
+
+ return _loggers[name]
+
+
+def setup_logger(logger):
+ """ Setup a logger """
+ syslog_facility = logging.handlers.SysLogHandler.LOG_SYSLOG
+
+ formatter = logging.Formatter("probe_keyring[%(process)d] " +
+ "%(pathname)s:%(lineno)s " +
+ "%(levelname)8s [%(name)s] %(message)s")
+
+ handler = logging.handlers.SysLogHandler(address='/dev/log',
+ facility=syslog_facility)
+ handler.setLevel(logging.INFO)
+ handler.setFormatter(formatter)
+
+ logger.addHandler(handler)
+ logger.setLevel(logging.INFO)
+
+def configure():
+ """ Setup logging """
+ for logger in _loggers:
+ setup_logger(_loggers[logger])
+
+LOG = get_logger(__name__)
+
+def probe(auth_url, tenant, login):
+ """ Asks OpenStack Keystone for a token """
+
+ try:
+ url = auth_url + "tokens"
+ request_info = urllib2.Request(url)
+ request_info.add_header("Content-type", "application/json")
+ request_info.add_header("Accept", "application/json")
+ payload = json.dumps(
+ {"auth": {"tenantName": tenant,
+ "passwordCredentials": {"username": login,
+ "password": keyring.get_password('CGCS',login)}}})
+ request_info.add_data(payload)
+
+ request = urllib2.urlopen(request_info)
+ response = json.loads(request.read())
+ request.close()
+ return response['access']['token']['id']
+
+ except Exception as e:
+ LOG.error("%s, %s" % (e.code, e.read()))
+ return None
+
+def main():
+
+ global cmd_auth_url
+ global cmd_tenant
+ global cmd_os_username
+
+ cmd_auth_url = "http://127.0.0.1:5000/v2.0/tokens"
+ cmd_tenant = "tenant"
+ cmd_os_username = "username"
+
+ configure()
+
+# priviledge check (only allow Keyring retrieval if we are root)
+ if os.geteuid() == 0:
+ arg = 1
+ cmd_auth_url = sys.argv[arg]
+ arg += 1
+ cmd_tenant = sys.argv[arg]
+ arg += 1
+ cmd_os_username = sys.argv[arg]
+
+ try:
+ token_id = probe(cmd_auth_url, cmd_tenant, cmd_os_username)
+ if token_id is None:
+ sys.exit(-1)
+ sys.exit(0)
+ except Exception as e:
+ sys.exit(-1)
+

16
openstack/python-keystoneclient/python-keystoneclient/extend_token_expiry_window.patch
View File

@ -1,16 +0,0 @@
Index: python-keystoneclient-1.3.1/keystoneclient/auth/identity/base.py
===================================================================
--- python-keystoneclient-1.3.1.orig/keystoneclient/auth/identity/base.py
+++ python-keystoneclient-1.3.1/keystoneclient/auth/identity/base.py
@@ -34,8 +34,9 @@ def get_options():
@six.add_metaclass(abc.ABCMeta)
class BaseIdentityPlugin(base.BaseAuthPlugin):
- # we count a token as valid if it is valid for at least this many seconds
- MIN_TOKEN_LIFE_SECONDS = 1
+ # we count a token as valid (not needing refreshing) if it is valid for at
+ # least this many seconds before the token expiry time
+ MIN_TOKEN_LIFE_SECONDS = 120
def __init__(self,
auth_url=None,

45
openstack/python-keystoneclient/python-keystoneclient/internal-keystone-client-public-adminURL-detection.patch
View File

@ -1,45 +0,0 @@
---
keystoneclient/v2_0/client.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
--- a/keystoneclient/v2_0/client.py
+++ b/keystoneclient/v2_0/client.py
@@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import os
import logging
from keystoneclient.auth.identity import v2 as v2_auth
@@ -29,6 +30,8 @@ from keystoneclient.v2_0 import tenants
from keystoneclient.v2_0 import tokens
from keystoneclient.v2_0 import users
+import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
_logger = logging.getLogger(__name__)
@@ -130,6 +133,21 @@ class Client(httpclient.HTTPClient):
def __init__(self, **kwargs):
"""Initialize a new client for the Keystone v2.0 API."""
+
+ # NOTE(knasim-wrs): As per US76645, the Keystone adminURL
+ # is no longer an internal address since it needs to be
+ # accessible via remote Openstack client. Things get
+ # complicated with HTTPS where the internal keystone client
+ # gets this adminURL and cannot connect to Keystone server
+ # as it cannot verify the SSL certificate.
+ # We will check for this condition here, if OS_ENDPOINT_TYPE
+ # is not publicURL then this is an internal access scenario and
+ # Keystone client will be set to SSL insecure mode
+ if os.environ.get('OS_ENDPOINT_TYPE') == 'internalURL':
+ kwargs['insecure'] = True
+ # disable verbose insecurity warnings
+ requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+
super(Client, self).__init__(**kwargs)
self.certificates = certificates.CertificatesManager(self._adapter)

26
openstack/python-keystoneclient/python-keystoneclient/v2-client-empty-password-check.patch
View File

@ -1,26 +0,0 @@
---
keystoneclient/v2_0/shell.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/keystoneclient/v2_0/shell.py
+++ b/keystoneclient/v2_0/shell.py
@@ -141,7 +141,8 @@ def do_user_password_update(kc, args):
"""Update user password."""
user = utils.find_resource(kc.users, args.user)
new_passwd = args.passwd or utils.prompt_for_password()
- if new_passwd is None:
+ # if password is empty or blank then reject it
+ if new_passwd is None or new_passwd.strip() is "":
msg = (_("\nPlease specify password using the --pass option "
"or using the prompt"))
sys.exit(msg)
@@ -167,7 +168,8 @@ def do_password_update(kc, args):
currentpasswd = getpass.getpass(_('Current Password: '))
newpasswd = args.newpasswd
- while newpasswd is None:
+ # don't allow empty or blank passwords
+ while newpasswd is None or newpasswd.strip() is "":
passwd1 = getpass.getpass(_('New Password: '))
passwd2 = getpass.getpass(_('Repeat New Password: '))
if passwd1 == passwd2:

4
openstack/python-magnumclient/centos/build_srpm.data
View File

@ -1,6 +1,4 @@
TAR_NAME="python-magnumclient"
SRC_DIR="$CGCS_BASE/git/python-magnumclient"
TIS_BASE_SRCREV=6bef59aec50e41ec2133fad1bd1fc4c954a08312
TIS_PATCH_VER=1
TIS_PATCH_VER=0

165
openstack/python-magnumclient/centos/python-magnumclient.spec
View File

@ -9,8 +9,15 @@
%global default_python 2
%endif
%global common_desc \
This is a client library for Magnum built on the Magnum API. \
It provides a Python API (the magnumclient module) and a \
command-line tool (magnum).
%global common_desc_tests Python-magnumclient test subpackage
Name: python-%{pname}
Version: 2.7.0
Version: 2.10.0
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for Magnum API
@ -20,49 +27,54 @@ Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_vers
BuildArch: noarch
%description
This is a client library for Magnum built on the Magnum API.
It provides a Python API (the magnumclient module) and a
command-line tool (magnum).
%{common_desc}
%package -n python2-%{pname}
Summary: Client library for Magnum API
%{?python_provide:%python_provide python2-%{pname}}
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python-pbr
BuildRequires: python2-pbr
BuildRequires: git
# test dependencies
BuildRequires: python-oslo-utils
BuildRequires: python-stevedore
BuildRequires: python-requests
BuildRequires: python-oslo-i18n
BuildRequires: python-fixtures
BuildRequires: python-mock
BuildRequires: python-testtools
BuildRequires: python-keystoneauth1
BuildRequires: python-prettytable
BuildRequires: python2-oslo-utils
BuildRequires: python2-openstackclient
BuildRequires: python2-oslo-serialization
BuildRequires: python2-oslo-log
BuildRequires: python2-osprofiler
BuildRequires: python2-stevedore
BuildRequires: python2-requests
BuildRequires: python2-oslo-i18n
BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-testtools
BuildRequires: python2-keystoneauth1
BuildRequires: python2-prettytable
Requires: python-babel
Requires: python-cryptography
Requires: python2-babel
Requires: python2-cryptography
Requires: python2-keystoneauth1 >= 3.4.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-osc-lib >= 1.8.0
Requires: python2-os-client-config >= 1.28.0
Requires: python2-pbr
Requires: python2-prettytable
Requires: python2-six
%if 0%{?fedora} > 0
Requires: python2-decorator
%else
Requires: python-decorator
Requires: python-keystoneauth1 >= 3.1.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.20.0
Requires: python-osc-lib >= 1.7.0
Requires: python-os-client-config >= 1.28.0
Requires: python-pbr
Requires: python-prettytable
Requires: python-six
%endif
%description -n python2-%{pname}
This is a client library for Magnum built on the Magnum API.
It provides a Python API (the magnumclient module) and a
command-line tool (magnum).
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{pname}
@ -75,6 +87,10 @@ BuildRequires: python3-pbr
# test dependencies
BuildRequires: python3-oslo-utils
BuildRequires: python3-openstackclient
BuildRequires: python3-oslo-serialization
BuildRequires: python3-oslo-log
BuildRequires: python3-osprofiler
BuildRequires: python3-stevedore
BuildRequires: python3-requests
BuildRequires: python3-oslo-i18n
@ -87,48 +103,53 @@ BuildRequires: python3-prettytable
Requires: python3-babel
Requires: python3-cryptography
Requires: python3-decorator
Requires: python3-keystoneauth1 >= 3.1.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.20.0
Requires: python3-osc-lib >= 1.7.0
Requires: python3-keystoneauth1 >= 3.4.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-osc-lib >= 1.8.0
Requires: python3-os-client-config >= 1.28.0
Requires: python3-pbr
Requires: python3-prettytable
Requires: python3-six
%description -n python3-%{pname}
This is a client library for Magnum built on the Magnum API.
It provides a Python API (the magnumclient module) and a
command-line tool (magnum).
%{common_desc}
%endif
%package -n python-%{pname}-doc
Summary: python-magnumclient documentation
BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
BuildRequires: python-os-client-config
#BuildRequires: python-decorator
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
BuildRequires: python2-os-client-config
BuildRequires: openstack-macros
%if 0%{?fedora} > 0
BuildRequires: python2-decorator
%else
BuildRequires: python-decorator
%endif
%description -n python-%{pname}-doc
Documentation for python-magnumclient
%package -n python-%{pname}-tests
%package -n python2-%{pname}-tests
Summary: Python-magnumclient test subpackage
%{?python_provide:%python_provide python2-%{pname}-tests}
Requires: python-%{pname} = %{version}-%{release}
Requires: python-oslo-utils
Requires: python-stevedore
Requires: python-requests
Requires: python-oslo-i18n
Requires: python-fixtures
Requires: python-mock
Requires: python-testtools
Requires: python-keystoneauth1
Requires: python-prettytable
Requires: python2-%{pname} = %{version}-%{release}
Requires: python2-oslo-utils
Requires: python2-stevedore
Requires: python2-requests
Requires: python2-oslo-i18n
Requires: python2-fixtures
Requires: python2-mock
Requires: python2-testtools
Requires: python2-keystoneauth1
Requires: python2-prettytable
%description -n python-%{pname}-tests
Python-magnumclient test subpackage
%description -n python2-%{pname}-tests
%{common_desc_tests}
%if 0%{?with_python3}
%package -n python3-%{pname}-tests
@ -146,34 +167,32 @@ Requires: python3-keystoneauth1
Requires: python3-prettytable
%description -n python3-%{pname}-tests
Python-magnumclient test subpackage
%{common_desc_tests}
%endif
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# let RPM handle deps
rm -rf {test-,}requirements.txt
%py_req_cleanup
%build
export PBR_VERSION=%{version}
%py2_build
%py2_build_wheel
%if 0%{?with_python3}
%py3_build
%endif
# generate html docs
%{__python2} setup.py build_sphinx -b html
# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a
# tagged release
sphinx-build -b html doc/source doc/build/html
# Fix hidden-file-or-dir warnings
rm -rf doc/build/html/.{doctrees,buildinfo}
%py2_build_wheel
%install
export PBR_VERSION=%{version}
install -p -D -m 644 tools/magnum.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/magnum.bash_completion
%if 0%{?with_python3}
%py3_install
%if %{default_python} >= 3
@ -182,20 +201,21 @@ mv %{buildroot}%{_bindir}/magnum ./magnum.py3
%endif
%py2_install
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
%if 0%{?default_python} >= 3
mv magnum.py3 %{buildroot}%{_bindir}/magnum
%endif
#%check
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
%check
# tests are failing due to unicode not defined
# we are skipping the test
#%{__python2} setup.py test ||
#%if 0%{?with_python3}
#%{__python3} setup.py test ||
#%endif
%{__python2} setup.py test ||
%if 0%{?with_python3}
%{__python3} setup.py test ||
%endif
%files -n python2-%{pname}
%doc README.rst
@ -206,7 +226,6 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum
%endif
%{python2_sitelib}/*.egg-info
%exclude %{python2_sitelib}/%{pname}/tests
%{_sysconfdir}/bash_completion.d/magnum.bash_completion
%if 0%{?with_python3}
%files -n python3-%{pname}
@ -224,7 +243,7 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum
%license LICENSE
%doc doc/build/html
%files -n python-%{pname}-tests
%files -n python2-%{pname}-tests
%{python2_sitelib}/%{pname}/tests
%if 0%{?with_python3}
@ -242,6 +261,6 @@ Contains python wheels for %{name}
/wheels/*
%changelog
* Fri Aug 11 2017 Alfredo Moralejo <amoralej@redhat.com> 2.7.0-1
- Update to 2.7.0
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 2.10.0-1
- Update to 2.10.0

250
openstack/python-magnumclient/centos/python-magnumclient.spec.orig Normal file
View File

@ -0,0 +1,250 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global sname python-magnumclient
%global pname magnumclient
%if 0%{?fedora} >= 24
%global with_python3 1
%global default_python 3
%else
%global default_python 2
%endif
%global common_desc \
This is a client library for Magnum built on the Magnum API. \
It provides a Python API (the magnumclient module) and a \
command-line tool (magnum).
%global common_desc_tests Python-magnumclient test subpackage
Name: python-%{pname}
Version: 2.10.0
Release: 1%{?dist}
Summary: Client library for Magnum API
License: ASL 2.0
URL: https://launchpad.net/python-magnumclient
Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz
BuildArch: noarch
%description
%{common_desc}
%package -n python2-%{pname}
Summary: Client library for Magnum API
%{?python_provide:%python_provide python2-%{pname}}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pbr
BuildRequires: git
# test dependencies
BuildRequires: python2-oslo-utils
BuildRequires: python2-openstackclient
BuildRequires: python2-oslo-serialization
BuildRequires: python2-oslo-log
BuildRequires: python2-osprofiler
BuildRequires: python2-stevedore
BuildRequires: python2-requests
BuildRequires: python2-oslo-i18n
BuildRequires: python2-fixtures
BuildRequires: python2-mock
BuildRequires: python2-testtools
BuildRequires: python2-keystoneauth1
BuildRequires: python2-prettytable
Requires: python2-babel
Requires: python2-cryptography
Requires: python2-keystoneauth1 >= 3.4.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-osc-lib >= 1.8.0
Requires: python2-os-client-config >= 1.28.0
Requires: python2-pbr
Requires: python2-prettytable
Requires: python2-six
%if 0%{?fedora} > 0
Requires: python2-decorator
%else
Requires: python-decorator
%endif
%description -n python2-%{pname}
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{pname}
Summary: Client library for Magnum API
%{?python_provide:%python_provide python3-%{pname}}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr
# test dependencies
BuildRequires: python3-oslo-utils
BuildRequires: python3-openstackclient
BuildRequires: python3-oslo-serialization
BuildRequires: python3-oslo-log
BuildRequires: python3-osprofiler
BuildRequires: python3-stevedore
BuildRequires: python3-requests
BuildRequires: python3-oslo-i18n
BuildRequires: python3-fixtures
BuildRequires: python3-mock
BuildRequires: python3-testtools
BuildRequires: python3-keystoneauth1
BuildRequires: python3-prettytable
Requires: python3-babel
Requires: python3-cryptography
Requires: python3-decorator
Requires: python3-keystoneauth1 >= 3.4.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-osc-lib >= 1.8.0
Requires: python3-os-client-config >= 1.28.0
Requires: python3-pbr
Requires: python3-prettytable
Requires: python3-six
%description -n python3-%{pname}
%{common_desc}
%endif
%package -n python-%{pname}-doc
Summary: python-magnumclient documentation
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
BuildRequires: python2-os-client-config
BuildRequires: openstack-macros
%if 0%{?fedora} > 0
BuildRequires: python2-decorator
%else
BuildRequires: python-decorator
%endif
%description -n python-%{pname}-doc
Documentation for python-magnumclient
%package -n python2-%{pname}-tests
Summary: Python-magnumclient test subpackage
%{?python_provide:%python_provide python2-%{pname}-tests}
Requires: python2-%{pname} = %{version}-%{release}
Requires: python2-oslo-utils
Requires: python2-stevedore
Requires: python2-requests
Requires: python2-oslo-i18n
Requires: python2-fixtures
Requires: python2-mock
Requires: python2-testtools
Requires: python2-keystoneauth1
Requires: python2-prettytable
%description -n python2-%{pname}-tests
%{common_desc_tests}
%if 0%{?with_python3}
%package -n python3-%{pname}-tests
Summary: Python-magnumclient test subpackage
Requires: python3-%{pname} = %{version}-%{release}
Requires: python3-oslo-utils
Requires: python3-stevedore
Requires: python3-requests
Requires: python3-oslo-i18n
Requires: python3-fixtures
Requires: python3-mock
Requires: python3-testtools
Requires: python3-keystoneauth1
Requires: python3-prettytable
%description -n python3-%{pname}-tests
%{common_desc_tests}
%endif
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# let RPM handle deps
%py_req_cleanup
%build
%py2_build
%if 0%{?with_python3}
%py3_build
%endif
# generate html docs
# (TODO) Re-add -W once https://review.openstack.org/#/c/554197 is in a
# tagged release
sphinx-build -b html doc/source doc/build/html
# Fix hidden-file-or-dir warnings
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%if 0%{?with_python3}
%py3_install
%if %{default_python} >= 3
mv %{buildroot}%{_bindir}/magnum ./magnum.py3
%endif
%endif
%py2_install
%if 0%{?default_python} >= 3
mv magnum.py3 %{buildroot}%{_bindir}/magnum
%endif
%check
# tests are failing due to unicode not defined
# we are skipping the test
%{__python2} setup.py test ||
%if 0%{?with_python3}
%{__python3} setup.py test ||
%endif
%files -n python2-%{pname}
%doc README.rst
%license LICENSE
%{python2_sitelib}/%{pname}
%if 0%{?default_python} <= 2
%{_bindir}/magnum
%endif
%{python2_sitelib}/*.egg-info
%exclude %{python2_sitelib}/%{pname}/tests
%if 0%{?with_python3}
%files -n python3-%{pname}
%doc README.rst
%license LICENSE
%if 0%{?default_python} >= 3
%{_bindir}/magnum
%endif
%{python3_sitelib}/magnumclient
%{python3_sitelib}/*.egg-info
%exclude %{python3_sitelib}/%{pname}/tests
%endif
%files -n python-%{pname}-doc
%license LICENSE
%doc doc/build/html
%files -n python2-%{pname}-tests
%{python2_sitelib}/%{pname}/tests
%if 0%{?with_python3}
%files -n python3-%{pname}-tests
%{python3_sitelib}/%{pname}/tests
%endif
%changelog
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 2.10.0-1
- Update to 2.10.0

4
openstack/python-muranoclient/centos/build_srpm.data
View File

@ -1,5 +1,3 @@
TAR_NAME="python-muranoclient"
SRC_DIR="$CGCS_BASE/git/python-muranoclient"
TIS_BASE_SRCREV=9a31e6bd406b18b32a97bd11d0020426dd6ff318
TIS_PATCH_VER=2
TIS_PATCH_VER=0

126
openstack/python-muranoclient/centos/python-muranoclient.spec
View File

@ -7,8 +7,12 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global common_desc \
Client library for Murano built on the Murano API. It provides a Python \
API (the muranoclient module) and a command-line tool (murano).
Name: python-%{pypi_name}
Version: 0.14.0
Version: 1.1.1
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Client library for OpenStack Murano API
@ -18,45 +22,46 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
%description
Client library for Murano built on the Murano API. It provides a Python
API (the muranoclient module) and a command-line tool (murano).
BuildRequires: git
BuildRequires: openstack-macros
%description
%{common_desc}
%package -n python2-%{pypi_name}
BuildRequires: git
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: python2-pip
BuildRequires: python2-setuptools
BuildRequires: python2-wheel
BuildRequires: python-pbr >= 2.0.0
BuildRequires: python2-pbr >= 2.0.0
Requires: python-babel >= 2.3.4
Requires: python-glanceclient >= 1:2.8.0
Requires: python-httplib2 >= 0.7.5
Requires: python-iso8601 >= 0.1.11
Requires: python-keystoneclient >= 1:3.8.0
Requires: python-murano-pkg-check >= 0.3.0
Requires: python-pbr >= 2.0.0
Requires: python-prettytable >= 0.7
Requires: python-requests >= 2.10.0
Requires: python-six >= 1.9.0
Requires: python-yaql >= 1.1.0
Requires: python-osc-lib >= 1.7.0
Requires: python-oslo-log >= 3.22.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.20.0
Requires: pyOpenSSL >= 0.14
Requires: python2-babel >= 2.3.4
Requires: python2-glanceclient >= 1:2.8.0
Requires: python2-iso8601 >= 0.1.11
Requires: python2-keystoneclient >= 1:3.8.0
Requires: python2-murano-pkg-check >= 0.3.0
Requires: python2-pbr >= 2.0.0
Requires: python2-prettytable >= 0.7.2
Requires: python2-requests >= 2.14.2
Requires: python2-six >= 1.10.0
Requires: python2-yaql >= 1.1.3
Requires: python2-osc-lib >= 1.10.0
Requires: python2-oslo-log >= 3.36.0
Requires: python2-oslo-i18n >= 3.15.3
Requires: python2-oslo-serialization >= 2.18.0
Requires: python2-oslo-utils >= 3.33.0
Requires: python2-pyOpenSSL >= 16.2.0
%if 0%{?fedora} > 0
Requires: python2-pyyaml >= 3.10
%else
Requires: PyYAML >= 3.10
%endif
Summary: Client library for OpenStack Murano API.
%{?python_provide:%python_provide python2-%{pypi_name}}
%description -n python2-%{pypi_name}
Client library for Murano built on the Murano API. It provides a Python
API (the muranoclient module) and a command-line tool (murano).
%{common_desc}
# Python3 package
%if 0%{?with_python3}
@ -71,52 +76,44 @@ BuildRequires: python-tools
Requires: python3-babel >= 2.3.4
Requires: python3-glanceclient >= 1:2.8.0
Requires: python3-httplib2 >= 0.7.5
Requires: python3-iso8601 >= 0.1.11
Requires: python3-keystoneclient >= 1:3.8.0
Requires: python3-murano-pkg-check >= 0.3.0
Requires: python3-pbr >= 2.0.0
Requires: python3-prettytable >= 0.7
Requires: python3-requests >= 2.10.0
Requires: python3-six >= 1.9.0
Requires: python3-yaql >= 1.1.0
Requires: python3-osc-lib >= 1.7.0
Requires: python3-oslo-log >= 3.22.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.20.0
Requires: python3-oslo-utils >= 3.18.0
Requires: python3-pyOpenSSL >= 0.14
Requires: python3-prettytable >= 0.7.2
Requires: python3-requests >= 2.14.2
Requires: python3-six >= 1.10.0
Requires: python3-yaql >= 1.1.3
Requires: python3-osc-lib >= 1.10.0
Requires: python3-oslo-log >= 3.36.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-utils >= 3.33.0
Requires: python3-pyOpenSSL >= 16.2.0
Requires: python3-PyYAML >= 3.10
%description -n python3-%{pypi_name}
Client library for Murano built on the Murano API. It provides a Python
API (the muranoclient module) and a command-line tool (murano).
%{common_desc}
%endif
# Documentation package
%package -n python-%{pypi_name}-doc
Summary: Documentation for OpenStack Murano API Client
BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
%description -n python-%{pypi_name}-doc
Documentation for the client library for interacting with Openstack
Murano API.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
# Let RPM handle the dependencies
rm -f test-requirements.txt requirements.txt
%py_req_cleanup
%if 0%{?with_python3}
rm -rf %{py3dir}
@ -127,6 +124,7 @@ cp -a . %{py3dir}
%build
export PBR_VERSION=%{version}
%{__python2} setup.py build
%py2_build_wheel
%if 0%{?with_python3}
pushd %{py3dir}
@ -135,12 +133,11 @@ popd
%endif
# generate html docs
%{__python2} setup.py build_sphinx -b html
export PYTHONPATH=.
sphinx-build -W -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%py2_build_wheel
%install
export PBR_VERSION=%{version}
%if 0%{?with_python3}
@ -151,10 +148,6 @@ 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/
install -p -D -m 644 tools/murano.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/murano.bash_completion
# rename binaries, make compat symlinks
pushd %{buildroot}%{_bindir}
@ -165,17 +158,20 @@ done
%endif
popd
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
# prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%files -n python2-%{pypi_name}
%license LICENSE
%doc README.rst
%{python2_sitelib}/%{pypi_name}
%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info
%{_bindir}/murano*
%{_sysconfdir}/bash_completion.d/murano.bash_completion
# Files for python3
%if 0%{?with_python3}
@ -192,6 +188,12 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='
%doc doc/build/html
%license LICENSE
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}-%{version}.tgz
@ -204,7 +206,9 @@ Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Mon Aug 14 2017 Alfredo Moralejo <amoralej@redhat.com> 0.14.0-1
- Update to 0.14.0
%changelog
* Thu Aug 16 2018 RDO <dev@lists.rdoproject.org> 1.1.1-1
- Update to 1.1.1

182
openstack/python-muranoclient/centos/python-muranoclient.spec.orig Normal file
View File

@ -0,0 +1,182 @@
%global pypi_name muranoclient
%if 0%{?fedora}
%global with_python3 0
%{!?python3_shortver: %global python3_shortver %(%{__python3} -c 'import sys; print(str(sys.version_info.major) + "." + str(sys.version_info.minor))')}
%endif
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
%global common_desc \
Client library for Murano built on the Murano API. It provides a Python \
API (the muranoclient module) and a command-line tool (murano).
Name: python-%{pypi_name}
Version: 1.1.1
Release: 1%{?dist}
Summary: Client library for OpenStack Murano API
License: ASL 2.0
URL: http://pypi.python.org/pypi/%{name}
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: git
BuildRequires: openstack-macros
%description
%{common_desc}
%package -n python2-%{pypi_name}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-pbr >= 2.0.0
Requires: python2-babel >= 2.3.4
Requires: python2-glanceclient >= 1:2.8.0
Requires: python2-iso8601 >= 0.1.11
Requires: python2-keystoneclient >= 1:3.8.0
Requires: python2-murano-pkg-check >= 0.3.0
Requires: python2-pbr >= 2.0.0
Requires: python2-prettytable >= 0.7.2
Requires: python2-requests >= 2.14.2
Requires: python2-six >= 1.10.0
Requires: python2-yaql >= 1.1.3
Requires: python2-osc-lib >= 1.10.0
Requires: python2-oslo-log >= 3.36.0
Requires: python2-oslo-i18n >= 3.15.3
Requires: python2-oslo-serialization >= 2.18.0
Requires: python2-oslo-utils >= 3.33.0
Requires: python2-pyOpenSSL >= 16.2.0
%if 0%{?fedora} > 0
Requires: python2-pyyaml >= 3.10
%else
Requires: PyYAML >= 3.10
%endif
Summary: Client library for OpenStack Murano API.
%{?python_provide:%python_provide python2-%{pypi_name}}
%description -n python2-%{pypi_name}
%{common_desc}
# Python3 package
%if 0%{?with_python3}
%package -n python3-%{pypi_name}
Summary: Support of EC2 API for OpenStack
%{?python_provide:%python_provide python3-%{pypi_name}}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-pbr >= 2.0.0
BuildRequires: python-tools
Requires: python3-babel >= 2.3.4
Requires: python3-glanceclient >= 1:2.8.0
Requires: python3-iso8601 >= 0.1.11
Requires: python3-keystoneclient >= 1:3.8.0
Requires: python3-murano-pkg-check >= 0.3.0
Requires: python3-pbr >= 2.0.0
Requires: python3-prettytable >= 0.7.2
Requires: python3-requests >= 2.14.2
Requires: python3-six >= 1.10.0
Requires: python3-yaql >= 1.1.3
Requires: python3-osc-lib >= 1.10.0
Requires: python3-oslo-log >= 3.36.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-utils >= 3.33.0
Requires: python3-pyOpenSSL >= 16.2.0
Requires: python3-PyYAML >= 3.10
%description -n python3-%{pypi_name}
%{common_desc}
%endif
# Documentation package
%package -n python-%{pypi_name}-doc
Summary: Documentation for OpenStack Murano API Client
BuildRequires: python2-sphinx
BuildRequires: python2-openstackdocstheme
%description -n python-%{pypi_name}-doc
Documentation for the client library for interacting with Openstack
Murano API.
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
# Let RPM handle the dependencies
%py_req_cleanup
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
2to3 --write --nobackups %{py3dir}
%endif
%build
%{__python2} setup.py build
%if 0%{?with_python3}
pushd %{py3dir}
LANG=en_US.UTF-8 %{__python3} setup.py build
popd
%endif
# generate html docs
export PYTHONPATH=.
sphinx-build -W -b html doc/source doc/build/html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%install
%if 0%{?with_python3}
pushd %{py3dir}
LANG=en_US.UTF-8 %{__python3} setup.py install --skip-build --root %{buildroot}
mv %{buildroot}%{_bindir}/murano %{buildroot}%{_bindir}/python3-murano
popd
%endif
%{__python2} setup.py install --skip-build --root %{buildroot}
# rename binaries, make compat symlinks
pushd %{buildroot}%{_bindir}
%if 0%{?with_python3}
for i in %{pypi_name}-{3,%{?python3_shortver}}; do
ln -s python3-%{pypi_name} $i
done
%endif
popd
%files -n python2-%{pypi_name}
%license LICENSE
%doc README.rst
%{python2_sitelib}/%{pypi_name}
%{python2_sitelib}/python_%{pypi_name}-*-py?.?.egg-info
%{_bindir}/murano*
# Files for python3
%if 0%{?with_python3}
%files -n python3-%{pypi_name}
%license LICENSE
%doc README.rst
%{_bindir}/python3-murano
%{_bindir}/murano*
%{python3_sitelib}/%{pypi_name}
%{python3_sitelib}/python_%{pypi_name}-%{version}-py?.?.egg-info
%endif
%files -n python-%{pypi_name}-doc
%doc doc/build/html
%license LICENSE
%changelog
* Thu Aug 16 2018 RDO <dev@lists.rdoproject.org> 1.1.1-1
- Update to 1.1.1

8
openstack/python-networking-sfc/centos/python-networking-sfc.spec
View File

@ -1,5 +1,7 @@
%global pypi_name networking-sfc
%global module networking_sfc
%global with_doc 0
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: python-%{pypi_name}
@ -91,10 +93,12 @@ implemented as a collection of physical network devices connected in series by
cables.
%if 0%{?with_doc}
%package -n python-%{pypi_name}-doc
Summary: Documentation for networking-sfc
%description -n python-%{pypi_name}-doc
Documentation for networking-sfc
%endif
%package -n python2-%{pypi_name}-tests
Summary: Tests for networking-sfc
@ -133,9 +137,11 @@ rm -rf %{module}/tests/unit/cli
%build
export PBR_VERSION=%{version}
%py2_build
%if 0%{?with_doc}
%{__python2} setup.py build_sphinx -b html
# remove the sphinx-build leftovers
rm -rf doc/build/html/.{doctrees,buildinfo}
%endif
# generate the configuration file
PYTHONPATH=. oslo-config-generator --config-file etc/oslo-config-generator/networking-sfc.conf
@ -167,9 +173,11 @@ mv etc/networking-sfc.conf.sample %{buildroot}%{_sysconfdir}/neutron/conf.d/neut
%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/conf.d/neutron-server/networking-sfc.conf
%exclude %{python2_sitelib}/%{module}/tests
%if 0%{?with_doc}
%files -n python-%{pypi_name}-doc
%doc doc/build/html/*
%license LICENSE
%endif
%files -n python2-%{pypi_name}-tests
%{python2_sitelib}/%{module}/tests

7
openstack/python-neutron/centos/stx-neutron.master_docker_image
View File

@ -1,7 +1,12 @@
BUILDER=loci
LABEL=stx-neutron
PROJECT=neutron
PROJECT_REPO=https://github.com/openstack/neutron.git
# Temporarily pointing to forked neutron repo
# This is necessary to pull in specific commits
# that have not yet merged upstream.
# Once all required commits are merged, this can
# revert back to the upstream repo.
PROJECT_REPO=https://github.com/donpenney/neutron
PIP_PACKAGES="networking-sfc pycrypto pylint tinyrpc lxml"
DIST_PACKAGES="ethtool lshw"
PROFILES="fluent neutron linuxbridge openvswitch"

3
openstack/python-neutronclient/centos/build_srpm.data
View File

@ -1,4 +1,3 @@
TAR_NAME=python-neutronclient
SRC_DIR="$CGCS_BASE/git/python-neutronclient"
TIS_BASE_SRCREV=e145c4ef8a0e8390f0468df422a757760e77f823
TIS_PATCH_VER=GITREVCOUNT
TIS_PATCH_VER=0

220
openstack/python-neutronclient/centos/python-neutronclient.spec
View File

@ -6,55 +6,84 @@
%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.5.0
Version: 6.9.1
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Neutron
License: ASL 2.0
URL: http://launchpad.net/python-neutronclient/
Source0: %{name}-%{version}.tar.gz
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
Client library and command line utility for interacting with OpenStack
Neutron's API.
%{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: python-setuptools
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python-pbr
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: python-babel >= 2.3.4
Requires: python-cliff >= 2.8.0
Requires: python-dateutil
Requires: python-iso8601 >= 0.1.11
Requires: python-netaddr >= 0.7.13
Requires: python-os-client-config >= 1.28.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.20.0
Requires: python-pbr
Requires: python-requests >= 2.10.0
Requires: python-simplejson >= 2.2.0
Requires: python-six >= 1.9.0
Requires: python-debtcollector >= 1.2.0
Requires: python-osc-lib >= 1.7.0
Requires: python-keystoneauth1 >= 3.1.0
Requires: python-keystoneclient >= 1:3.8.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}
Client library and command line utility for interacting with OpenStack
Neutron's API.
%{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}
@ -64,62 +93,73 @@ Summary: Python API and CLI for OpenStack Neutron
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.13
Requires: python3-netaddr >= 0.7.18
Requires: python3-os-client-config >= 1.28.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.20.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.10.0
Requires: python3-simplejson >= 2.2.0
Requires: python3-six >= 1.9.0
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.7.0
Requires: python3-keystoneauth1 >= 3.1.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}
Client library and command line utility for interacting with OpenStack
Neutron's API.
%{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: python-dateutil
BuildRequires: python-sphinx
BuildRequires: python-oslo-sphinx
BuildRequires: python-openstackdocstheme
BuildRequires: python-reno
BuildRequires: python-cliff
BuildRequires: python-keystoneauth1
BuildRequires: python-keystoneclient
BuildRequires: python-os-client-config
BuildRequires: python-osc-lib
BuildRequires: python-oslo-serialization
BuildRequires: python-oslo-utils
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
Client library and command line utility for interacting with OpenStack
Neutron's API.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%{common_desc}
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Let RPM handle the dependencies
rm -f test-requirements.txt requirements.txt
%py_req_cleanup
%build
export PBR_VERSION=%{version}
@ -129,47 +169,56 @@ export PBR_VERSION=%{version}
%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
# Delete tests
rm -fr %{buildroot}%{python3_sitelib}/neutronclient/tests
%endif
%py2_install
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
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
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
install -pm 644 tools/neutron.bash_completion \
%{buildroot}%{_sysconfdir}/bash_completion.d/neutron
# STX: stage wheel files
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/neutronclient/tests
%{__python2} setup.py build_sphinx -b html
# prep SDK package
# STX: prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%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
%{_sysconfdir}/bash_completion.d
%{_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}
@ -177,15 +226,24 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
%doc README.rst
%{python3_sitelib}/%{sname}
%{python3_sitelib}/*.egg-info
%{_sysconfdir}/bash_completion.d
%{_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 sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
@ -198,7 +256,11 @@ Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Mon Aug 14 2017 Alfredo Moralejo <amoralej@redhat.com> 6.5.0-1
- Update to 6.5.0
%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

233
openstack/python-neutronclient/centos/python-neutronclient.spec.orig Normal file
View File

@ -0,0 +1,233 @@
%{!?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

3
openstack/python-novaclient/centos/build_srpm.data
View File

@ -1,4 +1,3 @@
TAR_NAME=python-novaclient
SRC_DIR=$CGCS_BASE/git/python-novaclient
TIS_BASE_SRCREV=a1c00740c5b709a7d2bc4289fa6e28eac7909b8f
TIS_PATCH_VER=GITREVCOUNT
TIS_PATCH_VER=0

130
openstack/python-novaclient/centos/python-novaclient.spec
View File

@ -1,54 +1,56 @@
%{!?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: 9.1.1
Version: 11.0.0
Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Python API and CLI for OpenStack Nova
License: ASL 2.0
URL: https://launchpad.net/python-novaclient
Source0: %{name}-%{version}.tar.gz
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
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.
%{common_desc}
%package -n python2-%{sname}
Summary: Python API and CLI for OpenStack Nova
%{?python_provide:%python_provide python2-novaclient}
BuildRequires: python2-devel
BuildRequires: python-pbr
BuildRequires: git
BuildRequires: python-setuptools
BuildRequires: python2-pbr
BuildRequires: python2-setuptools
BuildRequires: python2-pip
BuildRequires: python2-wheel
BuildRequires: python-dateutil
Requires: python-babel >= 2.3.4
Requires: python-iso8601 >= 0.1.11
Requires: python-keystoneauth1 >= 3.1.0
Requires: python-oslo-i18n >= 2.1.0
Requires: python-oslo-serialization >= 1.10.0
Requires: python-oslo-utils >= 3.20.0
Requires: python-pbr >= 2.0.0
Requires: python-prettytable >= 0.7.1
Requires: python-requests
Requires: python-simplejson >= 2.2.0
Requires: python-six >= 1.9.0
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}
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.
%{common_desc}
%if 0%{?with_python3}
%package -n python3-%{sname}
@ -61,50 +63,42 @@ BuildRequires: python3-setuptools
Requires: python3-babel >= 2.3.4
Requires: python3-iso8601 >= 0.1.11
Requires: python3-keystoneauth1 >= 3.1.0
Requires: python3-oslo-i18n >= 2.1.0
Requires: python3-oslo-serialization >= 1.10.0
Requires: python3-oslo-utils >= 3.20.0
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.1
Requires: python3-requests
Requires: python3-simplejson >= 2.2.0
Requires: python3-six >= 1.9.0
Requires: python3-prettytable >= 0.7.2
Requires: python3-simplejson >= 3.5.1
Requires: python3-six >= 1.10.0
%description -n python3-%{sname}
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.
%{common_desc}
%endif
%if 0%{?with_doc}
%package doc
Summary: Documentation for OpenStack Nova API Client
BuildRequires: python-sphinx
BuildRequires: python-openstackdocstheme
BuildRequires: python-oslo-utils
BuildRequires: python-keystoneauth1
BuildRequires: python-oslo-serialization
BuildRequires: python-prettytable
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
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.
%{common_desc}
This package contains auto-generated documentation.
%package sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%endif
%prep
%autosetup -n %{name}-%{upstream_version} -S git
# Let RPM handle the requirements
rm -f test-requirements.txt
%py_req_cleanup
%build
export PBR_VERSION=%{version}
@ -128,9 +122,6 @@ rm -fr %{buildroot}%{python3_sitelib}/novaclient/tests
mv %{buildroot}%{_bindir}/nova %{buildroot}%{_bindir}/nova-%{python2_version}
ln -s ./nova-%{python2_version} %{buildroot}%{_bindir}/nova-2
mkdir -p $RPM_BUILD_ROOT/wheels
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
ln -s ./nova-2 %{buildroot}%{_bindir}/nova
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
@ -140,25 +131,34 @@ install -pm 644 tools/nova.bash_completion \
# Delete tests
rm -fr %{buildroot}%{python2_sitelib}/novaclient/tests
%if 0%{?with_doc}
%{__python2} setup.py build_sphinx -b html
%{__python2} setup.py build_sphinx -b man
# 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/
# prep SDK package
mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
%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}
@ -171,14 +171,24 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
%{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 sdk
Summary: SDK files for %{name}
%description sdk
Contains SDK files for %{name} package
%files sdk
/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
@ -192,10 +202,8 @@ Contains python wheels for %{name}
%files wheels
/wheels/*
%changelog
* Fri Oct 06 2017 rdo-trunk <javier.pena@redhat.com> 1:9.1.1-1
- Update to 9.1.1
* Mon Aug 14 2017 Alfredo Moralejo <amoralej@redhat.com> 1:9.1.0-1
- Update to 9.1.0
* Thu Aug 09 2018 RDO <dev@lists.rdoproject.org> 1:11.0.0-1
- Update to 11.0.0

164
openstack/python-novaclient/centos/python-novaclient.spec.orig Normal file
View File

@ -0,0 +1,164 @@
%{!?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

5
openstack/python-openstackclient/centos/build_srpm.data
View File

@ -1 +1,4 @@
TIS_PATCH_VER=18
TAR_NAME=python-openstackclient
SRC_DIR="$CGCS_BASE/git/python-openstackclient"
COPY_LIST="$DISTRO/patches/*"
TIS_PATCH_VER=1

13
openstack/python-openstackclient/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,13 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 62817fd..2c25c75 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -10,7 +10,7 @@
Name: python-openstackclient
Version: 3.12.1
-Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: OpenStack Command-line Client
License: ASL 2.0

45
openstack/python-openstackclient/centos/meta_patches/0002-spec-remote-clients-sdk.patch
View File

@ -1,45 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 2c25c75..874e8a4 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -162,6 +162,13 @@ It is a thin wrapper to the stock python-*client modules that implement the
actual REST API client actions.
%endif
+%package sdk
+Summary: SDK files for %{name}
+
+%description sdk
+Contains SDK files for %{name} package
+
+
%prep
%autosetup -n %{name}-%{upstream_version} -S git
@@ -206,6 +213,12 @@ mv %{buildroot}%{python2_sitelib}/openstackclient/locale %{buildroot}%{_datadir}
rm -rf %{buildroot}%{python3_sitelib}/openstackclient/locale
%endif
+
+# prep SDK package
+mkdir -p %{buildroot}/usr/share/remote-clients/%{name}
+tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
+
+
# Find language files
%find_lang openstackclient --all-name
@@ -242,6 +255,10 @@ rm -rf .testrepository
%{python3_sitelib}/openstackclient
%{python3_sitelib}/*.egg-info
%endif
+
+%files sdk
+/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz
+
%changelog
* Tue Apr 03 2018 RDO <dev@lists.rdoproject.org> 3.12.1-1
- Update to 3.12.1
--
1.8.3.1

13
openstack/python-openstackclient/centos/meta_patches/0003-meta-dont-remove-requirements-txt.patch
View File

@ -1,13 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 874e8a4..8cea3b8 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -173,7 +173,7 @@ Contains SDK files for %{name} package
%autosetup -n %{name}-%{upstream_version} -S git
# We handle requirements ourselves, pkg_resources only bring pain
-rm -rf requirements.txt test-requirements.txt
+rm -rf test-requirements.txt
%build
%py2_build

12
openstack/python-openstackclient/centos/meta_patches/0004-added-missing-build-require-dateutil.patch
View File

@ -1,12 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 8cea3b8..dbb1daa 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -59,6 +59,7 @@ BuildRequires: python-reno
BuildRequires: python-requestsexceptions
BuildRequires: python-openstacksdk
BuildRequires: python-osprofiler
+BuildRequires: python-dateutil
Requires: python-pbr
Requires: python-babel

14
openstack/python-openstackclient/centos/meta_patches/0005-meta-patch-for-neutron-extensions.patch
View File

@ -1,14 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index dbb1daa..3ef7f0d 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -17,6 +17,9 @@ License: ASL 2.0
URL: http://github.com/openstack/%{name}
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+# WRS patches
+Patch0001: 0001-neutron-extensions.patch
+
BuildArch: noarch
%description

12
openstack/python-openstackclient/centos/meta_patches/0006-openstackClient_Passwordchange_warning.patch
View File

@ -1,12 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 3ef7f0d..9f624f1 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -19,6 +19,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_vers
# WRS patches
Patch0001: 0001-neutron-extensions.patch
+Patch0002: openstackClient_Passwordchange_warning.patch
BuildArch: noarch

12
openstack/python-openstackclient/centos/meta_patches/0007-CGTS-7814-warning-only-when-the-admin-password-chang.patch
View File

@ -1,12 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 9f624f1..4791547 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -20,6 +20,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_vers
# WRS patches
Patch0001: 0001-neutron-extensions.patch
Patch0002: openstackClient_Passwordchange_warning.patch
+Patch0003: CGTS-7814-warning-only-when-the-admin-password-chang.patch
BuildArch: noarch

25
openstack/python-openstackclient/centos/meta_patches/0008-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
View File

@ -1,25 +0,0 @@
From bf24d1a99d29ab66feb4b2c7c7e5839e1cc23ec3 Mon Sep 17 00:00:00 2001
From: Andy Ning <andy.ning@windriver.com>
Date: Thu, 2 Nov 2017 10:45:40 -0400
Subject: CGTS-7947: add --os-keystone-region-name to identity client
Signed-off-by: Andy Ning <andy.ning@windriver.com>
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 4791547..5d3d7b4 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -21,6 +21,7 @@ Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_vers
Patch0001: 0001-neutron-extensions.patch
Patch0002: openstackClient_Passwordchange_warning.patch
Patch0003: CGTS-7814-warning-only-when-the-admin-password-chang.patch
+Patch0004: 0001-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
BuildArch: noarch
--
2.7.4

33
openstack/python-openstackclient/centos/meta_patches/1000-remove-version-requirements.patch
View File

@ -1,33 +0,0 @@
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 5d3d7b4..44dd46b 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -70,17 +70,17 @@ BuildRequires: python-dateutil
Requires: python-pbr
Requires: python-babel
Requires: python-cliff
-Requires: python-openstacksdk >= 0.9.17
-Requires: python-oslo-i18n >= 2.1.0
-Requires: python-oslo-utils >= 3.20.0
-Requires: python-glanceclient >= 1:2.8.0
-Requires: python-keystoneauth1 >= 3.1.0
-Requires: python-keystoneclient >= 1:3.8.0
-Requires: python-novaclient >= 1:9.0.0
-Requires: python-cinderclient >= 3.1.0
-Requires: python-neutronclient >= 6.3.0
-Requires: python-six >= 1.9.0
-Requires: python-osc-lib >= 1.7.0
+Requires: python-openstacksdk
+Requires: python-oslo-i18n
+Requires: python-oslo-utils
+Requires: python-glanceclient
+Requires: python-keystoneauth1
+Requires: python-keystoneclient
+Requires: python-novaclient
+Requires: python-cinderclient
+Requires: python-neutronclient
+Requires: python-six
+Requires: python-osc-lib
Requires: python-%{client}-lang = %{version}-%{release}

36
openstack/python-openstackclient/centos/meta_patches/1001-Turn-off-openstackclient-check.patch
View File

@ -1,36 +0,0 @@
From 18d4d4009e230d6d0b820496d210641ab79802af Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Thu, 19 Oct 2017 14:19:56 -0500
Subject: Turn off openstackclient check
---
SPECS/python-openstackclient.spec | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 44dd46b..9bca398 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -229,12 +229,13 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e
# Find language files
%find_lang openstackclient --all-name
-%check
-%{__python2} setup.py test
-%if 0%{?with_python3}
-rm -rf .testrepository
-%{__python3} setup.py test
-%endif
+# WRS disable check.
+#%check
+#%{__python2} setup.py test
+#%if 0%{?with_python3}
+#rm -rf .testrepository
+#%{__python3} setup.py test
+#%endif
%files -n python2-%{client}
%license LICENSE
--
2.7.4

24
openstack/python-openstackclient/centos/meta_patches/1002-meta-us101470.patch
View File

@ -1,24 +0,0 @@
From 47de75f37476e81f627222417e652ac77b2a17ab Mon Sep 17 00:00:00 2001
From: Sen Yang <sen.yang@windriver.com>
Date: Wed, 20 Dec 2017 23:53:02 -0500
Subject: [PATCH 1/1] meta us101470
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 9bca398..3e184a9 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -22,6 +22,7 @@ Patch0001: 0001-neutron-extensions.patch
Patch0002: openstackClient_Passwordchange_warning.patch
Patch0003: CGTS-7814-warning-only-when-the-admin-password-chang.patch
Patch0004: 0001-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
+Patch0005: 0001-US101470-Openstackclient-implementation-of-novaclien.patch
BuildArch: noarch
--
1.8.3.1

24
openstack/python-openstackclient/centos/meta_patches/1003-meta-us101470.patch
View File

@ -1,24 +0,0 @@
From c330094f36df9e38c497d6cbfb03574e6ad368a0 Mon Sep 17 00:00:00 2001
From: Sen Yang <sen.yang@windriver.com>
Date: Fri, 5 Jan 2018 15:25:06 -0500
Subject: [PATCH 1/1] US101470 part2
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 3e184a9..1cf210a 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -23,6 +23,7 @@ Patch0002: openstackClient_Passwordchange_warning.patch
Patch0003: CGTS-7814-warning-only-when-the-admin-password-chang.patch
Patch0004: 0001-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
Patch0005: 0001-US101470-Openstackclient-implementation-of-novaclien.patch
+Patch0006: 0002-US101470-Openstackclient-implementation-of-novaclien.patch
BuildArch: noarch
--
1.8.3.1

25
openstack/python-openstackclient/centos/meta_patches/1004-meta-US106901-Openstack-CLI-Adoption.patch
View File

@ -1,25 +0,0 @@
From 12504bfa15db581d310f3e059b5c8dce0df1be9f Mon Sep 17 00:00:00 2001
From: Sen Yang <sen.yang@windriver.com>
Date: Thu, 1 Feb 2018 12:05:55 -0500
Subject: [PATCH 1/1] US106901 Openstack-CLI-Adoption for
Glance/Cinder/Ceilometer
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 1cf210a..6774444 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -24,6 +24,7 @@ Patch0003: CGTS-7814-warning-only-when-the-admin-password-chang.patch
Patch0004: 0001-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patch
Patch0005: 0001-US101470-Openstackclient-implementation-of-novaclien.patch
Patch0006: 0002-US101470-Openstackclient-implementation-of-novaclien.patch
+Patch0007: 0001-US106901-Openstack-CLI-Adoption.patch
BuildArch: noarch
--
1.8.3.1

25
openstack/python-openstackclient/centos/meta_patches/1005-meta-US106901-Openstack-CLI-Adoption.patch
View File

@ -1,25 +0,0 @@
From ddf5ea208a3ba122558e355fe8535bcba024d2c8 Mon Sep 17 00:00:00 2001
From: Sen Yang <sen.yang@windriver.com>
Date: Mon, 5 Feb 2018 15:37:29 -0500
Subject: [PATCH 1/1] US106901 Openstack CLI Adoption: Cinder/Glance/Ceilometer
CI part2
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 6774444..4b1682e 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -25,6 +25,7 @@ Patch0004: 0001-CGTS-7947-add-os-keystone-region-name-to-identity-cl.patc
Patch0005: 0001-US101470-Openstackclient-implementation-of-novaclien.patch
Patch0006: 0002-US101470-Openstackclient-implementation-of-novaclien.patch
Patch0007: 0001-US106901-Openstack-CLI-Adoption.patch
+Patch0008: 0002-US106901-Openstack-CLI-Adoption.patch
BuildArch: noarch
--
1.8.3.1

26
openstack/python-openstackclient/centos/meta_patches/1006-meta-patch-for-endpoint-groups.patch
View File

@ -1,26 +0,0 @@
From ac2faa010188a6d824a8958c2971bcefe2a56ab9 Mon Sep 17 00:00:00 2001
From: Angie Wang <angie.Wang@windriver.com>
Date: Fri, 8 Jun 2018 16:05:52 -0400
Subject: [PATCH] meta patch for endpoint groups
---
SPECS/python-openstackclient.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 4b1682e..c192b2b 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -26,6 +26,9 @@ Patch0005: 0001-US101470-Openstackclient-implementation-of-novaclien.patc
Patch0006: 0002-US101470-Openstackclient-implementation-of-novaclien.patch
Patch0007: 0001-US106901-Openstack-CLI-Adoption.patch
Patch0008: 0002-US106901-Openstack-CLI-Adoption.patch
+Patch0009: 0001-Optimize-getting-endpoint-list.patch
+Patch0010: 0002-Add-support-for-endpoing-filter-commands.patch
+Patch0011: 0003-Add-support-for-endpoint-group-commands.patch
BuildArch: noarch
--
1.8.3.1

23
openstack/python-openstackclient/centos/meta_patches/1007-Allow-setting-wrs-binding-vif_model-using-osclient.patch
View File

@ -1,23 +0,0 @@
From 15a676bb74150546db8425ecae4976fb773661a0 Mon Sep 17 00:00:00 2001
From: Joseph Richard <Joseph.Richard@windriver.com>
Date: Tue, 25 Sep 2018 14:57:06 -0400
Subject: [PATCH 16/16] Allow setting wrs-binding:vif_model using osclient
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index c192b2b..29fec53 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -29,6 +29,7 @@ Patch0008: 0002-US106901-Openstack-CLI-Adoption.patch
Patch0009: 0001-Optimize-getting-endpoint-list.patch
Patch0010: 0002-Add-support-for-endpoing-filter-commands.patch
Patch0011: 0003-Add-support-for-endpoint-group-commands.patch
+Patch0012: 0001-Allow-setting-wrs-binding-vif_model-using-osclient.patch
BuildArch: noarch
--
1.8.3.1

24
openstack/python-openstackclient/centos/meta_patches/1008-Remove-wrs-binding-mac_filtering-and-setting-extensi.patch
View File

@ -1,24 +0,0 @@
From 6cf8ebc9e09035d49cfb051c4c4b03c4b8607ba3 Mon Sep 17 00:00:00 2001
From: Teresa Ho <teresa.ho@windriver.com>
Date: Tue, 30 Oct 2018 11:16:53 -0400
Subject: [PATCH] Remove wrs-binding:mac_filtering and setting extension
---
SPECS/python-openstackclient.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/python-openstackclient.spec b/SPECS/python-openstackclient.spec
index 29fec53..3dd52cb 100644
--- a/SPECS/python-openstackclient.spec
+++ b/SPECS/python-openstackclient.spec
@@ -30,6 +30,7 @@ Patch0009: 0001-Optimize-getting-endpoint-list.patch
Patch0010: 0002-Add-support-for-endpoing-filter-commands.patch
Patch0011: 0003-Add-support-for-endpoint-group-commands.patch
Patch0012: 0001-Allow-setting-wrs-binding-vif_model-using-osclient.patch
+Patch0013: 0001-Remove-wrs-binding-mac_filtering-and-setting-extensi.patch
BuildArch: noarch
--
1.8.3.1

Some files were not shown because too many files have changed in this diff Show More