Merge "Adapt to SQLAlchemy 1.4" into stable/wallaby

Author: Zuul

nova/cmd/manage.py

@@ -706,7 +706,16 @@ def cell0_default_connection():
             # worry about parsing and splitting a URL which could have special
             # characters in the password, which makes parsing a nightmare.
             url = sqla_url.make_url(connection)
-            url.database = url.database + '_cell0'
+
+            # TODO(gibi): remove hasattr() conditional in favor of "url.set()"
+            # when SQLAlchemy 1.4 is the minimum version in requirements
+            if hasattr(url, "set"):
+                url = url.set(database=url.database + '_cell0')
+            else:
+                # TODO(zzzeek): remove when SQLAlchemy 1.4
+                # is the minimum version in requirements
+                url.database = url.database + '_cell0'
+
             return urlparse.unquote(str(url))
 
         dbc = database_connection or cell0_default_connection()