diff --git a/tox.ini b/tox.ini
index e941094d0..dffb338bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,7 +15,7 @@ setenv =
    LC_ALL=C
    HOME={envdir}
 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 = stestr run {posargs}
@@ -61,7 +61,7 @@ commands = oslo_debug_helper -t tripleoclient/tests {posargs}
 [testenv:docs]
 basepython = python3
 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}/doc/requirements.txt
 commands =
@@ -83,7 +83,7 @@ commands =
 [testenv:releasenotes]
 basepython = python3
 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}/doc/requirements.txt
 commands =
diff --git a/tripleoclient/workflows/plan_management.py b/tripleoclient/workflows/plan_management.py
index 0a33e581f..d62e5d9e5 100644
--- a/tripleoclient/workflows/plan_management.py
+++ b/tripleoclient/workflows/plan_management.py
@@ -296,7 +296,7 @@ def _load_passwords(swift_client, name):
 def _update_passwords(swift_client, name, passwords):
     # Update the plan environment with the generated passwords. This
     # will be solved more elegantly once passwords are saved in a
-    # separate environment (https://review.openstack.org/#/c/467909/)
+    # separate environment (https://review.opendev.org/#/c/467909/)
     if passwords:
         try:
             env = yaml.safe_load(swift_client.get_object(