diff --git a/CHANGELOG b/CHANGELOG
index a66cb9b23e..8f2ebc87ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1888,7 +1888,7 @@ swift (1.13.1, OpenStack Icehouse)
       A new proxy config variable (strict_cors_mode, default to True)
       has been added. Setting it to False keeps the old behavior. For
       an overview of old versus new behavior, please see
-      https://review.openstack.org/#/c/69419/
+      https://review.opendev.org/#/c/69419/
 
     * Invert the responsibility of the two instances of proxy-logging in
       the proxy pipeline
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index bbffc24479..3aef4845f4 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -52,7 +52,7 @@ Reviewing Someone Else's Code
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 All code reviews in OpenStack projects are done on
-https://review.openstack.org/. Reviewing patches is one of the most effective
+https://review.opendev.org/. Reviewing patches is one of the most effective
 ways you can contribute to the community.
 
 We've written REVIEW_GUIDELINES.rst (found in this source tree) to help you
diff --git a/doc/source/first_contribution_swift.rst b/doc/source/first_contribution_swift.rst
index 5e00b7cc4c..cabfd0b3ca 100644
--- a/doc/source/first_contribution_swift.rst
+++ b/doc/source/first_contribution_swift.rst
@@ -117,7 +117,7 @@ Tracking your changes
 ---------------------
 
 After proposing changes to Swift, you can track them at
-https://review.openstack.org. After logging in, you will see a dashboard of
+https://review.opendev.org. After logging in, you will see a dashboard of
 "Outgoing reviews" for changes you have proposed, "Incoming reviews" for
 changes you are reviewing, and "Recently closed" changes for which you were
 either a reviewer or owner.
diff --git a/doc/source/install/controller-install-debian.rst b/doc/source/install/controller-install-debian.rst
index 9ab3294760..4d6ca523fe 100644
--- a/doc/source/install/controller-install-debian.rst
+++ b/doc/source/install/controller-install-debian.rst
@@ -47,4 +47,4 @@ Install and configure components
 
       .. code-block:: console
 
-         # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
+         # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample
diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst
index db082fd364..262577ffdc 100644
--- a/doc/source/install/controller-install-rdo.rst
+++ b/doc/source/install/controller-install-rdo.rst
@@ -45,6 +45,6 @@ Install and configure components
 
       .. code-block:: console
 
-         # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
+         # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample
 
    3. .. include:: controller-include.txt
diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst
index d2c987a46f..caf2b8efa5 100644
--- a/doc/source/install/controller-install-ubuntu.rst
+++ b/doc/source/install/controller-install-ubuntu.rst
@@ -47,6 +47,6 @@ Install and configure components
 
       .. code-block:: console
 
-         # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
+         # curl -o /etc/swift/proxy-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/proxy-server.conf-sample
 
    4. .. include:: controller-include.txt
diff --git a/doc/source/install/finalize-installation-rdo.rst b/doc/source/install/finalize-installation-rdo.rst
index 893412a5f5..5101b27a03 100644
--- a/doc/source/install/finalize-installation-rdo.rst
+++ b/doc/source/install/finalize-installation-rdo.rst
@@ -19,7 +19,7 @@ This section applies to Red Hat Enterprise Linux 7 and CentOS 7.
    .. code-block:: console
 
       # curl -o /etc/swift/swift.conf \
-        https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/queens
+        https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/swift.conf-sample
 
 #. Edit the ``/etc/swift/swift.conf`` file and complete the following
    actions:
diff --git a/doc/source/install/finalize-installation-ubuntu-debian.rst b/doc/source/install/finalize-installation-ubuntu-debian.rst
index 4178a77bc2..b20f55e636 100644
--- a/doc/source/install/finalize-installation-ubuntu-debian.rst
+++ b/doc/source/install/finalize-installation-ubuntu-debian.rst
@@ -19,7 +19,7 @@ This section applies to Ubuntu 14.04 (LTS) and Debian.
    .. code-block:: console
 
       # curl -o /etc/swift/swift.conf \
-        https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/queens
+        https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/swift.conf-sample
 
 #. Edit the ``/etc/swift/swift.conf`` file and complete the following
    actions:
diff --git a/doc/source/install/storage-install-rdo.rst b/doc/source/install/storage-install-rdo.rst
index ad21955174..9e714d86b0 100644
--- a/doc/source/install/storage-install-rdo.rst
+++ b/doc/source/install/storage-install-rdo.rst
@@ -133,9 +133,9 @@ Install and configure components
 
    .. code-block:: console
 
-      # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/queens
-      # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/queens
-      # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/queens
+      # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/account-server.conf-sample
+      # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/container-server.conf-sample
+      # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/object-server.conf-sample
 
 3.  .. include:: storage-include1.txt
 4.  .. include:: storage-include2.txt
diff --git a/doc/source/install/storage-install-ubuntu-debian.rst b/doc/source/install/storage-install-ubuntu-debian.rst
index 1399e3a520..6ac18a6c88 100644
--- a/doc/source/install/storage-install-ubuntu-debian.rst
+++ b/doc/source/install/storage-install-ubuntu-debian.rst
@@ -137,9 +137,9 @@ Install and configure components
 
    .. code-block:: console
 
-      # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/queens
-      # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/queens
-      # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/queens
+      # curl -o /etc/swift/account-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/account-server.conf-sample
+      # curl -o /etc/swift/container-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/container-server.conf-sample
+      # curl -o /etc/swift/object-server.conf https://opendev.org/openstack/swift/raw/branch/stable/queens/etc/object-server.conf-sample
 
 3.  .. include:: storage-include1.txt
 4.  .. include:: storage-include2.txt
diff --git a/swift/common/utils.py b/swift/common/utils.py
index 9ce71fa0b7..9431631c9f 100644
--- a/swift/common/utils.py
+++ b/swift/common/utils.py
@@ -2264,7 +2264,7 @@ def get_hub():
 
     Note about epoll:
 
-    Review: https://review.openstack.org/#/c/18806/
+    Review: https://review.opendev.org/#/c/18806/
 
     There was a problem where once out of every 30 quadrillion
     connections, a coroutine wouldn't wake up when the client
diff --git a/tox.ini b/tox.ini
index 3dcd65ea91..5930733b2d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_COVERAGE=1
          NOSE_COVER_BRANCHES=1
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 commands = find . ( -type f -o -type l ) -name "*.py[c|o]" -delete