[openstack-glance/el6-icehouse] unconfigure unsupported storage drivers
Pádraig Brady
pbrady at fedoraproject.org
Mon Mar 24 17:23:22 UTC 2014
commit 25087724ebaa09ee5739156d34d2eeb6646ba8f5
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Mar 24 17:21:53 2014 +0000
unconfigure unsupported storage drivers
This avoids a vmward ImportError and sheepdog driver warnings
...-Don-t-access-the-net-while-building-docs.patch | 4 +-
...-parallel-install-versions-of-epel-packag.patch | 4 +-
...d-the-uneeded-dependency-on-Crypto.Random.patch | 4 +-
0004-Avoid-NULLs-in-crypto-padding.patch | 4 +-
0005-Remove-runtime-dep-on-python-pbr.patch | 4 +-
0006-Revert-Switch-over-to-oslosphinx.patch | 4 +-
0007-unconfigure-unsupported-storage-drivers.patch | 53 ++++++++++++++++++++
openstack-glance.spec | 7 ++-
8 files changed, 71 insertions(+), 13 deletions(-)
---
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 1542b51..18b72cc 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -8,8 +8,8 @@ Subject: [PATCH] Don't access the net while building docs
Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 2253323..fb2131e 100644
diff --git a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index ae3fec0..d426f8a 100644
--- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -11,8 +11,8 @@ Delve into pkg_resources a little to get it to modify sys.path,
so that our parallel installed egg takes precedence over the
system default module versions.
---
- glance/__init__.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
+ glance/__init__.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/glance/__init__.py b/glance/__init__.py
index e69de29..625552c 100644
diff --git a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
index e55ed88..a4a099d 100644
--- a/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
+++ b/0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
@@ -12,8 +12,8 @@ but I'm leaving that as is for now:
http://www.codekoala.com/blog/2009/aes-encryption-python-using-pycrypto/#comment-25921785
http://eli.thegreenplace.net/2010/06/25/aes-encryption-of-files-in-python-with-pycrypto/
---
- glance/common/crypt.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
+ glance/common/crypt.py | 8 ++------
+ 1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index f719d11..971fe4f 100644
diff --git a/0004-Avoid-NULLs-in-crypto-padding.patch b/0004-Avoid-NULLs-in-crypto-padding.patch
index ed743dd..8d8ac8e 100644
--- a/0004-Avoid-NULLs-in-crypto-padding.patch
+++ b/0004-Avoid-NULLs-in-crypto-padding.patch
@@ -17,8 +17,8 @@ Reviewed-on: https://code.engineering.redhat.com/gerrit/2809
Reviewed-by: Nikola Dipanov <ndipanov at redhat.com>
Tested-by: Nikola Dipanov <ndipanov at redhat.com>
---
- glance/common/crypt.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ glance/common/crypt.py | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/glance/common/crypt.py b/glance/common/crypt.py
index 971fe4f..15f72b4 100644
diff --git a/0005-Remove-runtime-dep-on-python-pbr.patch b/0005-Remove-runtime-dep-on-python-pbr.patch
index 8e5b49d..0f508ea 100644
--- a/0005-Remove-runtime-dep-on-python-pbr.patch
+++ b/0005-Remove-runtime-dep-on-python-pbr.patch
@@ -4,8 +4,8 @@ Date: Wed, 18 Sep 2013 19:18:43 -1000
Subject: [PATCH] Remove runtime dep on python pbr
---
- glance/version.py | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
+ glance/version.py | 29 +++++++++++++++++++++++++++--
+ 1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/glance/version.py b/glance/version.py
index 0172206..ac67472 100644
diff --git a/0006-Revert-Switch-over-to-oslosphinx.patch b/0006-Revert-Switch-over-to-oslosphinx.patch
index 3215a38..265a760 100644
--- a/0006-Revert-Switch-over-to-oslosphinx.patch
+++ b/0006-Revert-Switch-over-to-oslosphinx.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] Revert "Switch over to oslosphinx"
This reverts commit 69df886b761dd6ee47a15cad4f11e030f1e1c286.
---
- doc/source/conf.py | 2 +-
- test-requirements.txt | 2 +-
+ doc/source/conf.py | 2 +-
+ test-requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
diff --git a/0007-unconfigure-unsupported-storage-drivers.patch b/0007-unconfigure-unsupported-storage-drivers.patch
new file mode 100644
index 0000000..af37bb1
--- /dev/null
+++ b/0007-unconfigure-unsupported-storage-drivers.patch
@@ -0,0 +1,53 @@
+From 66542ed2c9231ab2571189978d9d46fc24b40bbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Mon, 24 Mar 2014 17:09:36 +0000
+Subject: [PATCH] unconfigure 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 5eae5b4..e78828c 100644
+--- a/etc/glance-api.conf
++++ b/etc/glance-api.conf
+@@ -18,9 +18,7 @@ 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.vmware_datastore.Store,
+
+
+ # Maximum image size (in bytes) that may be uploaded through the
+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 04c6f8e..c3c39c8 100644
+--- a/glance/store/__init__.py
++++ b/glance/store/__init__.py
+@@ -39,9 +39,7 @@ store_opts = [
+ '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',
+ ],
+ help=_('List of which store classes and store class locations '
+ 'are currently known to glance at startup.')),
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 441df8f..9ee0b97 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,7 +2,7 @@
Name: openstack-glance
Version: 2014.1
-Release: 0.3.b3%{?dist}
+Release: 0.4.b3%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
@@ -31,6 +31,7 @@ Patch0003: 0003-avoid-the-uneeded-dependency-on-Crypto.Random.patch
Patch0004: 0004-Avoid-NULLs-in-crypto-padding.patch
Patch0005: 0005-Remove-runtime-dep-on-python-pbr.patch
Patch0006: 0006-Revert-Switch-over-to-oslosphinx.patch
+Patch0007: 0007-unconfigure-unsupported-storage-drivers.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -127,6 +128,7 @@ This package contains documentation files for glance.
%patch0004 -p1
%patch0005 -p1
%patch0006 -p1
+%patch0007 -p1
# Remove bundled egg-info
@@ -340,6 +342,9 @@ fi
%doc doc/build/html
%changelog
+* Mon Mar 24 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1-0.4.b3
+- unconfigure unsupported storage drivers
+
* Fri Mar 21 2014 Flavio Percoco <flavio at redhat.com> 2014.1-0.3.b3
- Update to Icehouse milestone 3
More information about the scm-commits
mailing list