Merge lp:~corey.bryant/glance/2014.2.2 into lp:~ubuntu-server-dev/glance/juno

[Corey Bryant]

[lp:~corey.bryant/glance/2014.2.2]

317. By Corey Bryant on 2015-02-09

* Resynchronize with stable/juno (d9a928e) (LP: #1418695):
  - [da10e96] Adding filesystem schema check in async task
  - [7d5d865] Cleanup chunks for deleted image that was 'saving'
  - [5191ed1] Prevent file, swift+config and filesystem schemes
  - [0400de4] Fix and add a test case for IPv6
  - [07a99e1] Fix getaddrinfo if dnspython is installed
  - [d9a928e] To prevent client use v2 patch api to handle file and swift location
* d/p/fix-requirements.patch: Rebased.
* d/p/ipv6-support.patch: Dropped. Fix is now upstream.
* d/control: Bump minimum python-eventlet to get socket_timeout support.

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-08 17:59:50 +0000
+++ debian/changelog	2015-02-09 13:56:48 +0000
@@ -1,3 +1,18 @@
+glance (1:2014.2.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/juno (d9a928e) (LP: #1418695):
+    - [da10e96] Adding filesystem schema check in async task
+    - [7d5d865] Cleanup chunks for deleted image that was 'saving'
+    - [5191ed1] Prevent file, swift+config and filesystem schemes
+    - [0400de4] Fix and add a test case for IPv6
+    - [07a99e1] Fix getaddrinfo if dnspython is installed
+    - [d9a928e] To prevent client use v2 patch api to handle file and swift location
+  * d/p/fix-requirements.patch: Rebased.
+  * d/p/ipv6-support.patch: Dropped. Fix is now upstream.
+  * d/control: Bump minimum python-eventlet to get socket_timeout support.
+
+ -- Corey Bryant <[e-mail]>  Thu, 05 Feb 2015 14:35:06 -0500
+
 glance (1:2014.2.1-0ubuntu1) utopic; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/control'
--- debian/control	2014-12-05 22:01:05 +0000
+++ debian/control	2015-02-09 13:56:48 +0000
@@ -9,7 +9,7 @@
  python-boto (>= 2.12.0),
  python-cinderclient (>= 1:1.0.8),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
  python-fixtures (>= 0.3.12),
  python-glance-store (>= 0.1.1),
  python-greenlet (>= 0.3.2),
@@ -70,7 +70,7 @@
  python-boto (>= 2.12.0),
  python-cinderclient (>= 1:1.0.8),
  python-crypto (>= 2.6),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.13.0-1ubuntu3.1~),
  python-glance-store (>= 0.1.1),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-10-13 18:37:28 +0000
+++ debian/patches/fix-requirements.patch	2015-02-09 13:56:48 +0000
@@ -8,20 +8,20 @@
 
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -12,18 +12,17 @@ greenlet>=0.3.2
+@@ -12,18 +12,17 @@
  # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
+ SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
  anyjson>=0.3.3
--eventlet>=0.15.1
+-eventlet>=0.15.1,<0.16.0
 +eventlet>=0.13.0
  PasteDeploy>=1.5.0
 -Routes>=1.12.3,!=2.0
 +Routes>=1.12.3
  WebOb>=1.2.3
  argparse
--boto>=2.32.1
+-boto>=2.32.1,<2.35.0
 +boto>=2.20.1
- sqlalchemy-migrate>=0.9.1,!=0.9.2
+ sqlalchemy-migrate==0.9.1
  httplib2>=0.7.5
  kombu>=2.5.0
  pycrypto>=2.6

=== removed file 'debian/patches/ipv6-support.patch'
--- debian/patches/ipv6-support.patch	2014-10-03 11:06:47 +0000
+++ debian/patches/ipv6-support.patch	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-From a6702e912a80827212f173e4e4d3cdb0e8151d86 Mon Sep 17 00:00:00 2001
-From: Hui Xiang <[e-mail]>
-Date: Thu, 19 Jun 2014 10:25:58 +0800
-Subject: [PATCH] Fix getaddrinfo if dnspython is installed
-
-If dnspython is present in the environment then eventlet
-monkeypatches socket.getaddrinfo() with an implementation
-which doesn't work for IPv6.
-
-Closes-Bug: 1331885
-Change-Id: I795e004eac3f032217ff9cb0047f1976306fbb71
----
- glance/cmd/__init__.py   |   14 ++++++++++++++
- glance/tests/__init__.py |   15 +++++++++++++++
- 2 files changed, 29 insertions(+)
-
-diff --git a/glance/cmd/__init__.py b/glance/cmd/__init__.py
-index a02646b..c2aa8e4 100644
---- a/glance/cmd/__init__.py
-+++ b/glance/cmd/__init__.py
-@@ -14,6 +14,20 @@
- #    under the License.
- 
- from glance import i18n
-+import os
-+import sys
-+
-+# All of this is because if dnspython is present in your environment then
-+# eventlet monkeypatches socket.getaddrinfo() with an implementation which
-+# doesn't work for IPv6. What we're checking here is that the magic
-+# environment variable was set when the import happened.
-+if ('eventlet' in sys.modules and
-+        os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes'):
-+    raise ImportError(_('eventlet imported before glance/cmd/__init__ '
-+                        '(env var set to %s)')
-+                      % os.environ.get('EVENTLET_NO_GREENDNS'))
-+
-+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
- 
- i18n.enable_lazy()
- i18n.install('glance')
-diff --git a/glance/tests/__init__.py b/glance/tests/__init__.py
-index b1f1268..957169a 100644
---- a/glance/tests/__init__.py
-+++ b/glance/tests/__init__.py
-@@ -13,6 +13,21 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import os
-+import sys
-+
-+# All of this is because if dnspython is present in your environment
-+# then eventlet monkeypatches socket.getaddrinfo() with an implementation
-+# which doesn't work for IPv6. What we're checking here is that the magic
-+# environment variable was set when the import happened.
-+if ('eventlet' in sys.modules and
-+        os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes'):
-+    raise ImportError(_('eventlet imported before tests/__init__ '
-+                        '(env var set to %s)')
-+                      % os.environ.get('EVENTLET_NO_GREENDNS'))
-+
-+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-+
- # See http://code.google.com/p/python-nose/issues/detail?id=373
- # The code below enables tests to work with i18n _() blocks
- import six.moves.builtins as __builtin__
--- 
-1.7.9.5
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-12-05 22:01:05 +0000
+++ debian/patches/series	2015-02-09 13:56:48 +0000
@@ -1,5 +1,4 @@
 update-glance-store-tests.patch
 sql_conn.patch
 fix-requirements.patch
-ipv6-support.patch
 skip-online-tests.patch