diff -Nru glance-17.0.0/debian/changelog glance-17.0.0/debian/changelog
--- glance-17.0.0/debian/changelog	2018-10-02 19:44:56.000000000 +0000
+++ glance-17.0.0/debian/changelog	2018-11-09 11:45:00.000000000 +0000
@@ -1,8 +1,16 @@
-glance (2:17.0.0-0ubuntu4~cloud0) bionic-rocky; urgency=medium
+glance (2:17.0.0-0ubuntu4.1~cloud0) bionic-rocky; urgency=medium
 
   * New update for the Ubuntu Cloud Archive.
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Tue, 02 Oct 2018 19:44:56 +0000
+ -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Fri, 09 Nov 2018 11:45:00 +0000
+
+glance (2:17.0.0-0ubuntu4.1) cosmic; urgency=medium
+
+  * d/gbp.conf: Create stable/rocky branch.
+  * d/p/fix-py3-recursion.patch: Cherry-picked from upstream master branch to
+    fix error with infinite recursion under Python 3 (LP: #1800601).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 31 Oct 2018 13:55:56 -0400
 
 glance (2:17.0.0-0ubuntu4) cosmic; urgency=medium
 
diff -Nru glance-17.0.0/debian/gbp.conf glance-17.0.0/debian/gbp.conf
--- glance-17.0.0/debian/gbp.conf	2018-10-02 16:34:42.000000000 +0000
+++ glance-17.0.0/debian/gbp.conf	2018-10-31 17:55:56.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = master
+debian-branch = stable/rocky
 upstream-tag = %(version)s
 pristine-tar = True
 
diff -Nru glance-17.0.0/debian/patches/fix-py3-recursion.patch glance-17.0.0/debian/patches/fix-py3-recursion.patch
--- glance-17.0.0/debian/patches/fix-py3-recursion.patch	1970-01-01 00:00:00.000000000 +0000
+++ glance-17.0.0/debian/patches/fix-py3-recursion.patch	2018-10-31 17:55:56.000000000 +0000
@@ -0,0 +1,81 @@
+From 43587fb93d8d949d9a9895153ac06ea4e7e6d150 Mon Sep 17 00:00:00 2001
+From: James Page <james.page@ubuntu.com>
+Date: Fri, 2 Nov 2018 10:10:49 +0000
+Subject: [PATCH] py3: fix recursion issue under py37
+
+Add tox target and resolve issue with infinite recursion in
+ExtraProperties class by directly using methods on the dict
+class.
+
+Closes-Bug: 1800601
+
+Change-Id: Ie98c4287c8bd1c364655adb99c7a88d1d451496e
+---
+ glance/domain/__init__.py |  8 ++++----
+ tox.ini                   | 14 ++++++++++++++
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
+index 7feb1edf..0bb6a296 100644
+--- a/glance/domain/__init__.py
++++ b/glance/domain/__init__.py
+@@ -300,9 +300,9 @@ class ExtraProperties(collections.MutableMapping, dict):
+ 
+     def __eq__(self, other):
+         if isinstance(other, ExtraProperties):
+-            return dict(self).__eq__(dict(other))
++            return dict.__eq__(self, dict(other))
+         elif isinstance(other, dict):
+-            return dict(self).__eq__(other)
++            return dict.__eq__(self, other)
+         else:
+             return False
+ 
+@@ -310,10 +310,10 @@ class ExtraProperties(collections.MutableMapping, dict):
+         return not self.__eq__(other)
+ 
+     def __len__(self):
+-        return dict(self).__len__()
++        return dict.__len__(self)
+ 
+     def keys(self):
+-        return dict(self).keys()
++        return dict.keys(self)
+ 
+ 
+ class ImageMembership(object):
+diff --git a/tox.ini b/tox.ini
+index 0f88bc38..8692ec68 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -34,6 +34,10 @@ commands = ostestr --slowest {posargs}
+ basepython = python3.5
+ commands = ostestr --slowest {posargs}
+ 
++[testenv:py37]
++basepython = python3.7
++commands = ostestr --slowest {posargs}
++
+ [testenv:functional]
+ setenv =
+   TEST_PATH = ./glance/tests/functional
+@@ -51,6 +55,16 @@ whitelist_externals =
+ commands =
+   stestr run --blacklist-file ./broken-functional-py35-ssl-tests.txt {posargs}
+ 
++[testenv:functional-py37]
++basepython = python3.7
++setenv =
++  TEST_PATH = ./glance/tests/functional
++ignore_errors = True
++whitelist_externals =
++  bash
++commands =
++  stestr run --blacklist-file ./broken-functional-py35-ssl-tests.txt {posargs}
++
+ [testenv:broken-py35-ssl-tests]
+ # NOTE(rosmaita): these tests were being skipped due to bug #1482633, but we
+ # want it to be obvious that Glance is affected by the eventlet ssl-handshake
+-- 
+2.19.1
+
diff -Nru glance-17.0.0/debian/patches/series glance-17.0.0/debian/patches/series
--- glance-17.0.0/debian/patches/series	2018-10-02 16:34:42.000000000 +0000
+++ glance-17.0.0/debian/patches/series	2018-10-31 17:55:56.000000000 +0000
@@ -1,3 +1,4 @@
 drop-sphinxcontrib-apidoc.patch
 add-root-tar-support.patch
 handle-StopIteration.patch
+fix-py3-recursion.patch