[openstack-glance] Update to the folsom openstack release
Pádraig Brady
pbrady at fedoraproject.org
Mon May 28 16:12:27 UTC 2012
commit 214824b097696122ae45efa7b86f56ff20a3bceb
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon May 28 16:47:45 2012 +0100
Update to the folsom openstack release
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 4 +-
...re-swift-auth-URL-includes-trailing-slash.patch | 37 -
...auto-create-suppression-config-presentati.patch | 27 +
0002-search-for-logger-in-PATH.patch | 38 -
0003-Fix-content-type-for-qpid-notifier.patch | 63 -
0004-Omit-Content-Length-on-chunked-transfer.patch | 183 --
...-Fix-i18n-in-glance.notifier.notify_kombu.patch | 28 -
0007-Support-DB-auto-create-suppression.patch | 2222 --------------------
openstack-glance.spec | 26 +-
sources | 2 +-
11 files changed, 41 insertions(+), 2590 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94a6b6a..d85deb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/glance-2012.1~rc1.tar.gz
/glance-2012.1~rc2.tar.gz
/glance-2012.1.tar.gz
+/glance-2012.2~f1.tar.gz
diff --git a/0006-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
similarity index 89%
rename from 0006-Don-t-access-the-net-while-building-docs.patch
rename to 0001-Don-t-access-the-net-while-building-docs.patch
index 3b5e7f1..c111aea 100644
--- a/0006-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 6a63200908b9efd846c59a0747f10502d4d819fe Mon Sep 17 00:00:00 2001
+From 0b63dcd89930d3a96651f0de8e23210f400094f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 17:12:54 +0000
Subject: [PATCH] Don't access the net while building docs
@@ -12,7 +12,7 @@ Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index a6a3c35..670e4f3 100644
+index bfe640a..6053d66 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -45,7 +45,6 @@ sys.path = [os.path.abspath('../../glance'),
diff --git a/0002-improve-DB-auto-create-suppression-config-presentati.patch b/0002-improve-DB-auto-create-suppression-config-presentati.patch
new file mode 100644
index 0000000..4b87eef
--- /dev/null
+++ b/0002-improve-DB-auto-create-suppression-config-presentati.patch
@@ -0,0 +1,27 @@
+From 21919c82bcbcf4bbd41e2ca5df3728ed672fa57e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+Date: Fri, 18 May 2012 14:23:41 +0100
+Subject: [PATCH] improve DB auto-create suppression config presentation
+
+Add the default option (matching upstream),
+so that we can provide comments in the config file,
+and also position the option close to related ones.
+---
+ etc/glance-registry.conf | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf
+index 8597411..37d71ff 100644
+--- a/etc/glance-registry.conf
++++ b/etc/glance-registry.conf
+@@ -23,6 +23,10 @@ backlog = 4096
+ # See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
+ sql_connection = sqlite:///glance.sqlite
+
++# Whether the glance service creates the database tables
++# automatically at startup, or explicitly with db_sync
++db_auto_create = True
++
+ # Period in seconds after which SQLAlchemy should reestablish its connection
+ # to the database.
+ #
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 4745932..8026955 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,26 +1,21 @@
Name: openstack-glance
-Version: 2012.1
-Release: 8%{?dist}
+Version: 2012.2
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/essex/2012.1/+download/glance-%{version}.tar.gz
+Source0: https://launchpad.net/glance/folsom/folsom-1/+download/glance-%{version}~f1.tar.gz
Source1: openstack-glance-api.service
Source2: openstack-glance-registry.service
Source3: openstack-glance.logrotate
#
-# patches_base=2012.1
+# patches_base=folsom-1
#
-Patch0001: 0001-Ensure-swift-auth-URL-includes-trailing-slash.patch
-Patch0002: 0002-search-for-logger-in-PATH.patch
-Patch0003: 0003-Fix-content-type-for-qpid-notifier.patch
-Patch0004: 0004-Omit-Content-Length-on-chunked-transfer.patch
-Patch0005: 0005-Fix-i18n-in-glance.notifier.notify_kombu.patch
-Patch0006: 0006-Don-t-access-the-net-while-building-docs.patch
-Patch0007: 0007-Support-DB-auto-create-suppression.patch
+Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
+Patch0002: 0002-improve-DB-auto-create-suppression-config-presentati.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -55,6 +50,7 @@ Requires: pysendfile
Requires: python-eventlet
Requires: python-httplib2
Requires: python-iso8601
+Requires: python-jsonschema
Requires: python-migrate
Requires: python-paste-deploy
Requires: python-routes
@@ -99,11 +95,6 @@ This package contains documentation files for glance.
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/registry/db/migrate_repo/manage.py
@@ -236,6 +227,9 @@ fi
%doc doc/build/html
%changelog
+* Tue May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-1
+- Update to Folsom milestone 1
+
* Tue May 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-8
- Fix an issue with glance-manage db_sync (#823702)
diff --git a/sources b/sources
index 0be26f0..bca0c75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-751273bbb1bd0a05a66409e32aa2ba63 glance-2012.1.tar.gz
+06ea4bf13949ae8714fed54158098a5b glance-2012.2~f1.tar.gz
More information about the scm-commits
mailing list