hguemar pushed to openstack-zaqar (master). "Update to upstream 2015.1.0 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Jun 12 19:27:58 UTC 2015
From 3290335244f8df32b03a153ebcb6e98d573d0156 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Fri, 12 Jun 2015 10:36:20 +0200
Subject: Update to upstream 2015.1.0
Cleanup spec
Drop pbr patch
diff --git a/.gitignore b/.gitignore
index 6ef0c14..87aaa90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/zaqar-2014.2.b3.tar.gz
/zaqar-2014.2.tar.gz
+/zaqar-2015.1.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-PBR.patch b/0001-Remove-runtime-dependency-on-PBR.patch
deleted file mode 100644
index 3ece606..0000000
--- a/0001-Remove-runtime-dependency-on-PBR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7a27036f3ba845fed70fc11fbe25c841d8fd1e91 Mon Sep 17 00:00:00 2001
-From: Jon Bernard <jbernard at tuxion.com>
-Date: Tue, 22 Apr 2014 13:16:29 -0400
-Subject: [PATCH] Remove runtime dependency on PBR
-
----
- zaqar/version.py | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/zaqar/version.py b/zaqar/version.py
-index fbcdb67..8038ba1 100644
---- a/zaqar/version.py
-+++ b/zaqar/version.py
-@@ -13,11 +13,29 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
-
--import pbr.packaging
--import pbr.version
-
-
--version_info = pbr.version.VersionInfo('zaqar')
-+class VersionInfo(object):
-+ release = "REDHATRELEASE"
-+ version = "REDHATVERSION"
-+
-+ def version_string(self):
-+ return self.version
-+
-+ def cached_version_string(self):
-+ return self.version
-+
-+ def release_string(self):
-+ return self.release
-+
-+ def canonical_version_string(self):
-+ return self.version
-+
-+ def version_string_with_vcs(self):
-+ return self.release
-+
-+
-+version_info = VersionInfo()
-
-
- def verify_sha(expected):
diff --git a/openstack-zaqar.spec b/openstack-zaqar.spec
index e7ca4ec..5b516be 100644
--- a/openstack-zaqar.spec
+++ b/openstack-zaqar.spec
@@ -1,23 +1,19 @@
%global project zaqar
Name: openstack-%{project}
-Version: 2014.2
+Version: 2015.1.0
Release: 1%{?dist}
Summary: Message queuing service for OpenStack
-Group: Applications/System
License: ASL 2.0
URL: https://wiki.openstack.org/wiki/Zaqar
Source0: http://tarballs.openstack.org/zaqar/%{project}-%{version}.tar.gz
Source1: %{project}-dist.conf
+# generated configuration file w/ oslo-config-generator
+Source2: %{project}.conf.sample
Source10: %{name}.service
Source11: %{name}.logrotate
-#
-# patches_base=2014.2
-#
-Patch0001: 0001-Remove-runtime-dependency-on-PBR.patch
-
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -52,6 +48,7 @@ Requires: python-iso8601
Requires: python-msgpack
Requires: python-webob
Requires: python-posix_ipc
+Requires: python-pbr
%description
Zaqar is a new OpenStack project to create a multi-tenant cloud queuing
@@ -63,8 +60,6 @@ durability, availability,and efficiency goals
%prep
%autosetup -n %{project}-%{version} -S git
-sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{project}/version.py
-
# Remove the requirements file so that pbr hooks don't add it
# to distutils requires_dist config
rm -rf {test-,}requirements.txt
@@ -72,6 +67,8 @@ rm -rf {test-,}requirements.txt
%build
%{__python2} setup.py build
+install -p -D -m 640 %{SOURCE2} etc/%{project}.conf.sample
+
# Programmatically update defaults in sample configs
# First we ensure all values are commented in appropriate format.
@@ -90,7 +87,7 @@ done < %{SOURCE1}']'
%install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
# Setup directories
@@ -155,10 +152,15 @@ exit 0
%defattr(-,root,root,-)
%{_unitdir}/%{name}.service
-%{python_sitelib}/%{project}
-%{python_sitelib}/%{project}-%{version}*.egg-info
+%{python2_sitelib}/%{project}
+%{python2_sitelib}/%{project}-%{version}*.egg-info
%changelog
+* Fri Jun 12 2015 Haikel Guemar <hguemar at fedoraproject.org> 2015.1.0-1
+- Update to upstream 2015.1.0
+- Dropping pbr patch
+- Spec cleanups
+
* Sun Oct 19 2014 Haïkel Guémar <hguemar at fedoraproject.org> 2014.2-1
- Update to upstream 2014.2
diff --git a/sources b/sources
index f626278..0204299 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8375462563ed0abbc55a83052083c325 zaqar-2014.2.tar.gz
+911bf0d148f09959e480f2bcdb0cd91f zaqar-2015.1.0.tar.gz
diff --git a/zaqar.conf.sample b/zaqar.conf.sample
new file mode 100644
index 0000000..c41878b
--- /dev/null
+++ b/zaqar.conf.sample
@@ -0,0 +1,395 @@
+[DEFAULT]
+
+#
+# From zaqar.bootstrap
+#
+
+# Activate privileged endpoints. (boolean value)
+#admin_mode = false
+
+# Enable pooling across multiple storage backends. If pooling is
+# enabled, the storage driver configuration is used to determine where
+# the catalogue/control plane data is kept. (boolean value)
+# Deprecated group/name - [DEFAULT]/sharding
+#pooling = false
+
+# Disable all reliability constrains. (boolean value)
+#unreliable = <None>
+
+#
+# From zaqar.transport.base
+#
+
+# Backend to use for authentication. For no auth, keep it empty.
+# Existing strategies: keystone. See also the keystone_authtoken
+# section below (string value)
+#auth_strategy =
+
+
+[drivers]
+
+#
+# From zaqar.bootstrap
+#
+
+# Transport driver to use. (string value)
+#transport = wsgi
+
+# Storage driver to use. (string value)
+#storage = mongodb
+
+
+[drivers:management_store:mongodb]
+
+#
+# From zaqar.storage.mongodb
+#
+
+# The private keyfile used to identify the local connection against
+# mongod. If included with the ``certifle`` then only the
+# ``ssl_certfile`` is needed. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_keyfile
+#ssl_keyfile = <None>
+
+# The certificate file used to identify the local connection against
+# mongod. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_certfile
+#ssl_certfile = <None>
+
+# Specifies whether a certificate is required from the other side of
+# the connection, and whether it will be validated if provided. It
+# must be one of the three values ``CERT_NONE``(certificates ignored),
+# ``CERT_OPTIONAL``(not required, but validated if provided), or
+# ``CERT_REQUIRED``(required and validated). If the value of this
+# parameter is not ``CERT_NONE``, then the ``ssl_ca_cert`` parameter
+# must point to a file of CA certificates. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_cert_reqs
+#ssl_cert_reqs = CERT_REQUIRED
+
+# The ca_certs file contains a set of concatenated "certification
+# authority" certificates, which are used to validate certificates
+# passed from the other end of the connection. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_ca_certs
+#ssl_ca_certs = <None>
+
+# Mongodb Connection URI. If ssl connection enabled, then
+# ``ssl_keyfile``, ``ssl_certfile``, ``ssl_cert_reqs``,
+# ``ssl_ca_certs`` need to be set accordingly. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/uri
+#uri = <None>
+
+# Database name. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/database
+#database = zaqar
+
+# Maximum number of times to retry a failed operation. Currently only
+# used for retrying a message post. (integer value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_attempts
+#max_attempts = 1000
+
+# Maximum sleep interval between retries (actual sleep time increases
+# linearly according to number of attempts performed). (floating point
+# value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_retry_sleep
+#max_retry_sleep = 0.1
+
+# Maximum jitter interval, to be added to the sleep interval, in order
+# to decrease probability that parallel requests will retry at the
+# same instant. (floating point value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_retry_jitter
+#max_retry_jitter = 0.005
+
+# Maximum number of times to retry an operation that failed due to a
+# primary node failover. (integer value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_reconnect_attempts
+#max_reconnect_attempts = 10
+
+# Base sleep interval between attempts to reconnect after a primary
+# node failover. The actual sleep time increases exponentially (power
+# of 2) each time the operation is retried. (floating point value)
+# Deprecated group/name - [drivers:storage:mongodb]/reconnect_sleep
+#reconnect_sleep = 0.02
+
+
+[drivers:management_store:redis]
+
+#
+# From zaqar.storage.redis
+#
+
+# Redis connection URI, taking one of three forms. For a direct
+# connection to a Redis server, use the form
+# "redis://host[:port][?options]", where port defaults to 6379 if not
+# specified. For an HA master-slave Redis cluster using Redis
+# Sentinel, use the form
+# "redis://host1[:port1][,host2[:port2],...,hostN[:portN]][?options]",
+# where each host specified corresponds to an instance of redis-
+# sentinel. In this form, the name of the Redis master used in the
+# Sentinel configuration must be included in the query string as
+# "master=<name>". Finally, to connect to a local instance of Redis
+# over a unix socket, you may use the form
+# "redis:/path/to/redis.sock[?options]". In all forms, the
+# "socket_timeout" option may be specified in the query string. Its
+# value is given in seconds. If not provided, "socket_timeout"
+# defaults to 0.1 seconds. (string value)
+# Deprecated group/name - [drivers:storage:redis]/uri
+#uri = redis://127.0.0.1:6379
+
+# Maximum number of times to retry an operation that failed due to a
+# redis node failover. (integer value)
+# Deprecated group/name - [drivers:storage:redis]/max_reconnect_attempts
+#max_reconnect_attempts = 10
+
+# Base sleep interval between attempts to reconnect after a redis node
+# failover. (floating point value)
+# Deprecated group/name - [drivers:storage:redis]/reconnect_sleep
+#reconnect_sleep = 1.0
+
+
+[drivers:management_store:sqlalchemy]
+
+#
+# From zaqar.storage.sqlalchemy
+#
+
+# An sqlalchemy URL (string value)
+# Deprecated group/name - [drivers:storage:sqlalchemy]/uri
+#uri = sqlite:///:memory:
+
+
+[drivers:message_store:mongodb]
+
+#
+# From zaqar.storage.mongodb
+#
+
+# The private keyfile used to identify the local connection against
+# mongod. If included with the ``certifle`` then only the
+# ``ssl_certfile`` is needed. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_keyfile
+#ssl_keyfile = <None>
+
+# The certificate file used to identify the local connection against
+# mongod. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_certfile
+#ssl_certfile = <None>
+
+# Specifies whether a certificate is required from the other side of
+# the connection, and whether it will be validated if provided. It
+# must be one of the three values ``CERT_NONE``(certificates ignored),
+# ``CERT_OPTIONAL``(not required, but validated if provided), or
+# ``CERT_REQUIRED``(required and validated). If the value of this
+# parameter is not ``CERT_NONE``, then the ``ssl_ca_cert`` parameter
+# must point to a file of CA certificates. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_cert_reqs
+#ssl_cert_reqs = CERT_REQUIRED
+
+# The ca_certs file contains a set of concatenated "certification
+# authority" certificates, which are used to validate certificates
+# passed from the other end of the connection. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/ssl_ca_certs
+#ssl_ca_certs = <None>
+
+# Mongodb Connection URI. If ssl connection enabled, then
+# ``ssl_keyfile``, ``ssl_certfile``, ``ssl_cert_reqs``,
+# ``ssl_ca_certs`` need to be set accordingly. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/uri
+#uri = <None>
+
+# Database name. (string value)
+# Deprecated group/name - [drivers:storage:mongodb]/database
+#database = zaqar
+
+# Maximum number of times to retry a failed operation. Currently only
+# used for retrying a message post. (integer value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_attempts
+#max_attempts = 1000
+
+# Maximum sleep interval between retries (actual sleep time increases
+# linearly according to number of attempts performed). (floating point
+# value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_retry_sleep
+#max_retry_sleep = 0.1
+
+# Maximum jitter interval, to be added to the sleep interval, in order
+# to decrease probability that parallel requests will retry at the
+# same instant. (floating point value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_retry_jitter
+#max_retry_jitter = 0.005
+
+# Maximum number of times to retry an operation that failed due to a
+# primary node failover. (integer value)
+# Deprecated group/name - [drivers:storage:mongodb]/max_reconnect_attempts
+#max_reconnect_attempts = 10
+
+# Base sleep interval between attempts to reconnect after a primary
+# node failover. The actual sleep time increases exponentially (power
+# of 2) each time the operation is retried. (floating point value)
+# Deprecated group/name - [drivers:storage:mongodb]/reconnect_sleep
+#reconnect_sleep = 0.02
+
+# Number of databases across which to partition message data, in order
+# to reduce writer lock %. DO NOT change this setting after initial
+# deployment. It MUST remain static. Also, you should not need a large
+# number of partitions to improve performance, esp. if deploying
+# MongoDB on SSD storage. (integer value)
+# Deprecated group/name - [drivers:storage:mongodb]/partitions
+#partitions = 2
+
+
+[drivers:message_store:redis]
+
+#
+# From zaqar.storage.redis
+#
+
+# Redis connection URI, taking one of three forms. For a direct
+# connection to a Redis server, use the form
+# "redis://host[:port][?options]", where port defaults to 6379 if not
+# specified. For an HA master-slave Redis cluster using Redis
+# Sentinel, use the form
+# "redis://host1[:port1][,host2[:port2],...,hostN[:portN]][?options]",
+# where each host specified corresponds to an instance of redis-
+# sentinel. In this form, the name of the Redis master used in the
+# Sentinel configuration must be included in the query string as
+# "master=<name>". Finally, to connect to a local instance of Redis
+# over a unix socket, you may use the form
+# "redis:/path/to/redis.sock[?options]". In all forms, the
+# "socket_timeout" option may be specified in the query string. Its
+# value is given in seconds. If not provided, "socket_timeout"
+# defaults to 0.1 seconds. (string value)
+# Deprecated group/name - [drivers:storage:redis]/uri
+#uri = redis://127.0.0.1:6379
+
+# Maximum number of times to retry an operation that failed due to a
+# redis node failover. (integer value)
+# Deprecated group/name - [drivers:storage:redis]/max_reconnect_attempts
+#max_reconnect_attempts = 10
+
+# Base sleep interval between attempts to reconnect after a redis node
+# failover. (floating point value)
+# Deprecated group/name - [drivers:storage:redis]/reconnect_sleep
+#reconnect_sleep = 1.0
+
+
+[drivers:message_store:sqlalchemy]
+
+#
+# From zaqar.storage.sqlalchemy
+#
+
+# An sqlalchemy URL (string value)
+# Deprecated group/name - [drivers:storage:sqlalchemy]/uri
+#uri = sqlite:///:memory:
+
+
+[drivers:transport:wsgi]
+
+#
+# From zaqar.transport.wsgi
+#
+
+# Address on which the self-hosting server will listen. (string value)
+#bind = 127.0.0.1
+
+# Port on which the self-hosting server will listen. (integer value)
+#port = 8888
+
+
+[pooling:catalog]
+
+#
+# From zaqar.storage.pooling
+#
+
+# Catalog storage driver. (string value)
+#storage = sqlalchemy
+
+
+[storage]
+
+#
+# From zaqar.storage.pipeline
+#
+
+# Pipeline to use for processing queue operations. This pipeline will
+# be consumed before calling the storage driver's controller methods.
+# (list value)
+#queue_pipeline =
+
+# Pipeline to use for processing message operations. This pipeline
+# will be consumed before calling the storage driver's controller
+# methods. (list value)
+#message_pipeline =
+
+# Pipeline to use for processing claim operations. This pipeline will
+# be consumed before calling the storage driver's controller methods.
+# (list value)
+#claim_pipeline =
+
+# Pipeline to use for processing subscription operations. This
+# pipeline will be consumed before calling the storage driver's
+# controller methods. (list value)
+#subscription_pipeline =
+
+
+[transport]
+
+#
+# From zaqar.transport.base
+#
+
+# Defines how long a message will be accessible. (integer value)
+#default_message_ttl = 3600
+
+# Defines how long a message will be in claimed state. (integer value)
+#default_claim_ttl = 300
+
+# Defines the message grace period in seconds. (integer value)
+#default_claim_grace = 60
+
+#
+# From zaqar.transport.validation
+#
+
+# Defines the maximum number of queues per page. (integer value)
+# Deprecated group/name - [limits:transport]/queue_paging_uplimit
+#max_queues_per_page = 20
+
+# Defines the maximum number of messages per page. (integer value)
+# Deprecated group/name - [limits:transport]/message_paging_uplimit
+#max_messages_per_page = 20
+
+# Defines the maximum number of subscriptions per page. (integer
+# value)
+# Deprecated group/name - [limits:transport]/subscription_paging_uplimit
+#max_subscriptions_per_page = 20
+
+# The maximum number of messages that can be claimed (OR) popped in a
+# single request (integer value)
+# Deprecated group/name - [DEFAULT]/max_messages_per_claim
+#max_messages_per_claim_or_pop = 20
+
+# Defines the maximum amount of metadata in a queue. (integer value)
+# Deprecated group/name - [limits:transport]/metadata_size_uplimit
+#max_queue_metadata = 65536
+
+# Defines the maximum size of message posts. (integer value)
+# Deprecated group/name - [DEFAULT]/max_message_size
+# Deprecated group/name - [limits:transport]/message_size_uplimit
+#max_messages_post_size = 262144
+
+# Maximum amount of time a message will be available. (integer value)
+# Deprecated group/name - [limits:transport]/message_ttl_max
+#max_message_ttl = 1209600
+
+# Maximum length of a message in claimed state. (integer value)
+# Deprecated group/name - [limits:transport]/claim_ttl_max
+#max_claim_ttl = 43200
+
+# Defines the maximum message grace period in seconds. (integer value)
+# Deprecated group/name - [limits:transport]/claim_grace_max
+#max_claim_grace = 43200
+
+# Defines supported subscriber types. (list value)
+#subscriber_types = http
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-zaqar.git/commit/?h=master&id=3290335244f8df32b03a153ebcb6e98d573d0156
More information about the scm-commits
mailing list