diff --git a/.gitmodules b/.gitmodules
index 6142cf16c7ca..c729b3e603de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,11 +13,11 @@
 [submodule "django_openstack_auth"]
 	path = django_openstack_auth
 	url = https://review.openstack.org/openstack/django_openstack_auth.git
-    branch = .
+    branch = master
 [submodule "glance"]
 	path = glance
 	url = https://review.openstack.org/openstack/glance.git
-    branch = .
+    branch = master
 [submodule "heat"]
 	path = heat
 	url = https://review.openstack.org/openstack/heat.git
@@ -37,55 +37,55 @@
 [submodule "oslo.config"]
 	path = oslo.config
 	url = https://review.openstack.org/openstack/oslo.config.git
-    branch = .
+    branch = master
 [submodule "oslo.messaging"]
 	path = oslo.messaging
 	url = https://review.openstack.org/openstack/oslo.messaging.git
-    branch = .
+    branch = master
 [submodule "python-ceilometerclient"]
 	path = python-ceilometerclient
 	url = https://review.openstack.org/openstack/python-ceilometerclient.git
-    branch = .
+    branch = master
 [submodule "python-cinderclient"]
 	path = python-cinderclient
 	url = https://review.openstack.org/openstack/python-cinderclient.git
-    branch = .
+    branch = master
 [submodule "python-glanceclient"]
 	path = python-glanceclient
 	url = https://review.openstack.org/openstack/python-glanceclient.git
-    branch = .
+    branch = master
 [submodule "python-heatclient"]
 	path = python-heatclient
 	url = https://review.openstack.org/openstack/python-heatclient.git
-    branch = .
+    branch = master
 [submodule "python-keystoneclient"]
 	path = python-keystoneclient
 	url = https://review.openstack.org/openstack/python-keystoneclient.git
-    branch = .
+    branch = master
 [submodule "python-neutronclient"]
 	path = python-neutronclient
 	url = https://review.openstack.org/openstack/python-neutronclient.git
-    branch = .
+    branch = master
 [submodule "python-novaclient"]
 	path = python-novaclient
 	url = https://review.openstack.org/openstack/python-novaclient.git
-    branch = .
+    branch = master
 [submodule "python-openstackclient"]
 	path = python-openstackclient
 	url = https://review.openstack.org/openstack/python-openstackclient.git
-    branch = .
+    branch = master
 [submodule "python-swiftclient"]
 	path = python-swiftclient
 	url = https://review.openstack.org/openstack/python-swiftclient.git
-    branch = .
+    branch = master
 [submodule "python-troveclient"]
 	path = python-troveclient
 	url = https://review.openstack.org/openstack/python-troveclient.git
-    branch = .
+    branch = master
 [submodule "requirements"]
 	path = requirements
 	url = https://review.openstack.org/openstack/requirements.git
-    branch = .
+    branch = master
 [submodule "swift"]
 	path = swift
 	url = https://review.openstack.org/openstack/swift.git
@@ -101,12 +101,12 @@
 [submodule "pbr"]
 	path = pbr
 	url = https://review.openstack.org/openstack-dev/pbr.git
-    branch = .
+    branch = master
 [submodule "devstack"]
 	path = devstack
 	url = https://review.openstack.org/openstack-dev/devstack.git
-    branch = .
+    branch = master
 [submodule "devstack-gate"]
 	path = devstack-gate
 	url = https://review.openstack.org/openstack-infra/devstack-gate.git
-    branch = .
+    branch = master
diff --git a/.gitreview b/.gitreview
index 698048fc1a36..73af54d43795 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/openstack.git
diff --git a/ceilometer b/ceilometer
index 29f2ffc7e511..1bbf17650f9d 160000
--- a/ceilometer
+++ b/ceilometer
@@ -1 +1 @@
-Subproject commit 29f2ffc7e511a152d6e8742cd233c3dc399b8fff
+Subproject commit 1bbf17650f9d94a22256f356abf84cc71c831f1f
diff --git a/cinder b/cinder
index c381a495144b..d507b600927e 160000
--- a/cinder
+++ b/cinder
@@ -1 +1 @@
-Subproject commit c381a495144b23b66a0394ca423ccb5654156387
+Subproject commit d507b600927e230e71673fa9b4f7974d69668ee7
diff --git a/devstack b/devstack
index b615df917005..f56a0ae2eca9 160000
--- a/devstack
+++ b/devstack
@@ -1 +1 @@
-Subproject commit b615df917005aad04856f8f07b51c8fc03fd7058
+Subproject commit f56a0ae2eca9c5d77799d85b57ea7dbb7cf601dc
diff --git a/devstack-gate b/devstack-gate
index 32b2b0e7408b..402044ae450d 160000
--- a/devstack-gate
+++ b/devstack-gate
@@ -1 +1 @@
-Subproject commit 32b2b0e7408bf947d52589e61226227c280e1e4c
+Subproject commit 402044ae450d25eeaf555f74f58e8f5816a75782
diff --git a/django_openstack_auth b/django_openstack_auth
index 259c57b5b6c8..58e881ec93b9 160000
--- a/django_openstack_auth
+++ b/django_openstack_auth
@@ -1 +1 @@
-Subproject commit 259c57b5b6c8fa0820a584edcae713ffca7c5b3d
+Subproject commit 58e881ec93b9803141c0f519da2e8142183a10ab
diff --git a/glance b/glance
index a5522f0bf2f4..49232d2e7faa 160000
--- a/glance
+++ b/glance
@@ -1 +1 @@
-Subproject commit a5522f0bf2f4013a4bfabf8a3056b5bfed3c09eb
+Subproject commit 49232d2e7faaf72e8783dd6a037d04402c4b3ca5
diff --git a/heat b/heat
index 093e203c09fd..ec3a0c61393e 160000
--- a/heat
+++ b/heat
@@ -1 +1 @@
-Subproject commit 093e203c09fd92f6838c1eb5d2a0b86aea8e5658
+Subproject commit ec3a0c61393ee4b1ad33f79da256e0a510281ded
diff --git a/horizon b/horizon
index 29cb522f31f3..1b0106e2804a 160000
--- a/horizon
+++ b/horizon
@@ -1 +1 @@
-Subproject commit 29cb522f31f3f580e3f8691f9fc28c580c0be54c
+Subproject commit 1b0106e2804a45e641433c4bd459e6bed85521c3
diff --git a/keystone b/keystone
index afbc75b08add..b07840a0532e 160000
--- a/keystone
+++ b/keystone
@@ -1 +1 @@
-Subproject commit afbc75b08add8fb5201f4ca7ccf1b7353fab138c
+Subproject commit b07840a0532ef92fda8dc00c99059ec96a98c564
diff --git a/neutron b/neutron
index 4601b14d1301..288432e3d1ea 160000
--- a/neutron
+++ b/neutron
@@ -1 +1 @@
-Subproject commit 4601b14d13018f89c683f47d22e3ade8880d97ff
+Subproject commit 288432e3d1ea3a53d24644b8dbd545c815485351
diff --git a/nova b/nova
index faabb91ab4b0..87f57c0a2cc0 160000
--- a/nova
+++ b/nova
@@ -1 +1 @@
-Subproject commit faabb91ab4b05cbab891334964a5586d735aabdd
+Subproject commit 87f57c0a2cc00a70edc87c5dc10bdefb6c01587b
diff --git a/oslo.config b/oslo.config
index c5f7e500b183..85daf7a6eb5e 160000
--- a/oslo.config
+++ b/oslo.config
@@ -1 +1 @@
-Subproject commit c5f7e500b18377255ba956571ccc67429f20e645
+Subproject commit 85daf7a6eb5e6e25a33d3ec0558242933741f129
diff --git a/oslo.messaging b/oslo.messaging
index a1b57a5452a9..393ecff34510 160000
--- a/oslo.messaging
+++ b/oslo.messaging
@@ -1 +1 @@
-Subproject commit a1b57a5452a9e714bb36e3fb038467cd4fdfcd0c
+Subproject commit 393ecff3451091404832dd6b8a088e1bec760101
diff --git a/pbr b/pbr
index 9f04dba0ecc0..1a3b55811776 160000
--- a/pbr
+++ b/pbr
@@ -1 +1 @@
-Subproject commit 9f04dba0ecc07a33dc4b256bec4f860c30b2b500
+Subproject commit 1a3b558117762fc55adba75e4b6379e9cc1c9680
diff --git a/python-ceilometerclient b/python-ceilometerclient
index c3283ec1e861..d3c2d139bc50 160000
--- a/python-ceilometerclient
+++ b/python-ceilometerclient
@@ -1 +1 @@
-Subproject commit c3283ec1e861f29a53c59c1a09f2a1bc21a713e4
+Subproject commit d3c2d139bc50fc7bad44e9f9527093d6f78ec4d5
diff --git a/python-cinderclient b/python-cinderclient
index 4a507601d7dd..71aee9e8c7e3 160000
--- a/python-cinderclient
+++ b/python-cinderclient
@@ -1 +1 @@
-Subproject commit 4a507601d7dded2efb1bd2e885155ba38db9538c
+Subproject commit 71aee9e8c7e317991e1620e4e992956b12b9e0d9
diff --git a/python-glanceclient b/python-glanceclient
index 32d9c42816b6..d158f1e75f91 160000
--- a/python-glanceclient
+++ b/python-glanceclient
@@ -1 +1 @@
-Subproject commit 32d9c42816b608220ae5692e573142dab6534604
+Subproject commit d158f1e75f915ee79cf7f4fd29a392a2c8f66483
diff --git a/python-heatclient b/python-heatclient
index 96dbb0911c8d..0bfb7899b297 160000
--- a/python-heatclient
+++ b/python-heatclient
@@ -1 +1 @@
-Subproject commit 96dbb0911c8d139a5b3fe64af82783cf81790ff8
+Subproject commit 0bfb7899b29784ee6d489142c977479d51c8d05e
diff --git a/python-keystoneclient b/python-keystoneclient
index 0341f933caf9..b29f478f28c4 160000
--- a/python-keystoneclient
+++ b/python-keystoneclient
@@ -1 +1 @@
-Subproject commit 0341f933caf91a522dffe42a5092c1e4a7925adb
+Subproject commit b29f478f28c4989156cfe87392cbd308e3f55c1e
diff --git a/python-neutronclient b/python-neutronclient
index 1dd88b9564db..24f6f2df3b4c 160000
--- a/python-neutronclient
+++ b/python-neutronclient
@@ -1 +1 @@
-Subproject commit 1dd88b9564dbe94f3294ab447cf0680f0c6f5685
+Subproject commit 24f6f2df3b4c02e5a2012f18eafe4b05ba136eb9
diff --git a/python-novaclient b/python-novaclient
index aadaf23b5eca..98ef444974fe 160000
--- a/python-novaclient
+++ b/python-novaclient
@@ -1 +1 @@
-Subproject commit aadaf23b5ecafd897dac430266192f9987c1ff6c
+Subproject commit 98ef444974fed3bed7009e5f4fb92002404e5e63
diff --git a/python-openstackclient b/python-openstackclient
index bca4cf95789f..39c00ab8b7a2 160000
--- a/python-openstackclient
+++ b/python-openstackclient
@@ -1 +1 @@
-Subproject commit bca4cf95789fc30577c796fdf349d072ef087f25
+Subproject commit 39c00ab8b7a2c5ee8b82a26f779966806236dbc8
diff --git a/python-swiftclient b/python-swiftclient
index 0cded7cfed9c..3be8eca70b53 160000
--- a/python-swiftclient
+++ b/python-swiftclient
@@ -1 +1 @@
-Subproject commit 0cded7cfed9c2840b8a9538b03ccb2b72065aafc
+Subproject commit 3be8eca70b53148f2dbcbab98dafd04b07e99da6
diff --git a/python-troveclient b/python-troveclient
index 12a577f15a76..a397f72da43b 160000
--- a/python-troveclient
+++ b/python-troveclient
@@ -1 +1 @@
-Subproject commit 12a577f15a76694b8dc0182fe3b503a765974290
+Subproject commit a397f72da43b8a09d5995f88df966918044583e3
diff --git a/requirements b/requirements
index 54453e40decc..55e80b9a7f2a 160000
--- a/requirements
+++ b/requirements
@@ -1 +1 @@
-Subproject commit 54453e40deccb08fd049750cf6d848ff69901644
+Subproject commit 55e80b9a7f2ad837db44b5c63bfc1ca87683dd5a
diff --git a/swift b/swift
index 1f4ec235cdfd..1f0058e61e90 160000
--- a/swift
+++ b/swift
@@ -1 +1 @@
-Subproject commit 1f4ec235cdfd8c868f2d6458532f9dc32c00b8ca
+Subproject commit 1f0058e61e9094cdf9484e982b7f662660bed87e
diff --git a/trove b/trove
index e5481026d3bd..358240964f48 160000
--- a/trove
+++ b/trove
@@ -1 +1 @@
-Subproject commit e5481026d3bd02b923cba6fa8dbcffaf77b2b6c3
+Subproject commit 358240964f48c78bb6f9d1bf5a41d3ed08668961