[openstack-glance] update to Icehouse release candidate 1
Pádraig Brady
pbrady at fedoraproject.org
Wed Apr 9 09:45:20 UTC 2014
commit 5ab263ef75321b8a90850cf79234902794850c2f
Author: Pádraig Brady <P at draigBrady.com>
Date: Wed Apr 9 10:10:15 2014 +0100
update to Icehouse release candidate 1
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
0002-Remove-runtime-dep-on-python-pbr.patch | 2 +-
0003-Revert-Switch-over-to-oslosphinx.patch | 34 ------------
0003-avoid-unsupported-storage-drivers.patch | 55 ++++++++++++++++++++
0004-unconfigure-unsupported-storage-drivers.patch | 53 -------------------
openstack-glance.spec | 19 ++++---
sources | 2 +-
8 files changed, 71 insertions(+), 97 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a066281..ce8e33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/glance-2014.1.b1.tar.gz
/glance-2014.1.b2.tar.gz
/glance-2014.1.b3.tar.gz
+/glance-2014.1.rc1.tar.gz
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 381be8e..6a8d901 100644
--- a/0001-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 181e6cdbba33f693fe19d8c756cf97c090046ca1 Mon Sep 17 00:00:00 2001
+From 36525d5b3b3b48c0fc51967d24ba63077358fc6c 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
diff --git a/0002-Remove-runtime-dep-on-python-pbr.patch b/0002-Remove-runtime-dep-on-python-pbr.patch
index ff107fd..e36eb07 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From a47a0006312ee545d66e7812931c9ecf54f3323c Mon Sep 17 00:00:00 2001
+From 45bef41c1a537426877cef1a1700886598035b04 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
Date: Mon, 9 Sep 2013 17:00:28 -1000
Subject: [PATCH] Remove runtime dep on python pbr
diff --git a/0003-avoid-unsupported-storage-drivers.patch b/0003-avoid-unsupported-storage-drivers.patch
new file mode 100644
index 0000000..8dca99a
--- /dev/null
+++ b/0003-avoid-unsupported-storage-drivers.patch
@@ -0,0 +1,55 @@
+From 976f4410ac3cac420c2f396a21e2ad6ddfa21373 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Wed, 9 Apr 2014 10:31:27 +0100
+Subject: [PATCH] avoid unsupported storage drivers
+
+---
+ etc/glance-api.conf | 2 --
+ etc/glance-cache.conf | 2 --
+ glance/store/__init__.py | 2 --
+ 3 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/etc/glance-api.conf b/etc/glance-api.conf
+index 12eca91..218e47d 100644
+--- a/etc/glance-api.conf
++++ b/etc/glance-api.conf
+@@ -17,10 +17,8 @@ default_store = file
+ # glance.store.rbd.Store,
+ # glance.store.s3.Store,
+ # glance.store.swift.Store,
+-# glance.store.sheepdog.Store,
+ # glance.store.cinder.Store,
+ # glance.store.gridfs.Store,
+-# glance.store.vmware_datastore.Store,
+ #known_stores = glance.store.filesystem.Store,
+ # glance.store.http.Store
+
+diff --git a/etc/glance-cache.conf b/etc/glance-cache.conf
+index 0246b67..04e5623 100644
+--- a/etc/glance-cache.conf
++++ b/etc/glance-cache.conf
+@@ -44,9 +44,7 @@ registry_port = 9191
+ # glance.store.rbd.Store,
+ # glance.store.s3.Store,
+ # glance.store.swift.Store,
+-# glance.store.sheepdog.Store,
+ # glance.store.cinder.Store,
+-# glance.store.vmware_datastore.Store,
+
+ # ============ Filesystem Store Options ========================
+
+diff --git a/glance/store/__init__.py b/glance/store/__init__.py
+index 33a67d6..7af3813 100644
+--- a/glance/store/__init__.py
++++ b/glance/store/__init__.py
+@@ -69,10 +69,8 @@ _ALL_STORES = [
+ 'glance.store.rbd.Store',
+ 'glance.store.s3.Store',
+ 'glance.store.swift.Store',
+- 'glance.store.sheepdog.Store',
+ 'glance.store.cinder.Store',
+ 'glance.store.gridfs.Store',
+- 'glance.store.vmware_datastore.Store'
+ ]
+
+
diff --git a/openstack-glance.spec b/openstack-glance.spec
index cba0a53..bc8ac41 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
Name: openstack-glance
Version: 2014.1
-Release: 0.4.b3%{?dist}
+Release: 0.5.rc1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/icehouse/icehouse-2/+download/glance-%{version}.b3.tar.gz
+Source0: https://launchpad.net/glance/icehouse/icehouse-2/+download/glance-%{version}.rc1.tar.gz
Source1: openstack-glance-api.service
Source2: openstack-glance-registry.service
Source3: openstack-glance-scrubber.service
@@ -18,12 +18,11 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2014.1.b3
+# patches_base=2014.1.rc1
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-Revert-Switch-over-to-oslosphinx.patch
-Patch0004: 0004-unconfigure-unsupported-storage-drivers.patch
+Patch0003: 0003-avoid-unsupported-storage-drivers.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -112,12 +111,11 @@ and delivery services for virtual disk images.
This package contains documentation files for glance.
%prep
-%setup -q -n glance-%{version}.b3
+%setup -q -n glance-%{version}.rc1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
# Remove bundled egg-info
rm -rf glance.egg-info
sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py
@@ -128,6 +126,9 @@ sed -i '/setuptools_git/d; /setup_requires/d; /install_requires/d; /dependency_l
sed -i s/REDHATGLANCEVERSION/%{version}/ glance/version.py
sed -i s/REDHATGLANCERELEASE/%{release}/ glance/version.py
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+
# Remove the requirements file so that pbr hooks don't add it
# to distutils requiers_dist config
rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -323,6 +324,10 @@ fi
%doc doc/build/html
%changelog
+* Wed Apr 09 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.5.rc1
+- Update to Icehouse release candidate 1
+- Depend on python-kombu for rabbit installations
+
* Mon Mar 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b3
- unconfigure unsupported storage drivers
diff --git a/sources b/sources
index 1b11e93..98b3add 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22913959c46b2a2ab9a61a5b8b1340e9 glance-2014.1.b3.tar.gz
+cdbf28a9c7fe6abd175e97a5772797c9 glance-2014.1.rc1.tar.gz
More information about the scm-commits
mailing list