diff --git a/specs/backlog-template.rst b/specs/backlog-template.rst
index d4bcbb0..d24378a 100644
--- a/specs/backlog-template.rst
+++ b/specs/backlog-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/mitaka-template.rst b/specs/mitaka-template.rst
index d4bcbb0..d24378a 100644
--- a/specs/mitaka-template.rst
+++ b/specs/mitaka-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/mitaka/implemented/watcher-add-actions-via-conf.rst b/specs/mitaka/implemented/watcher-add-actions-via-conf.rst
index cf7a863..fc3bd75 100644
--- a/specs/mitaka/implemented/watcher-add-actions-via-conf.rst
+++ b/specs/mitaka/implemented/watcher-add-actions-via-conf.rst
@@ -483,7 +483,7 @@ IRC discussions:
 
 * Action point related to `TaskFlow`_: http://eavesdrop.openstack.org/meetings/watcher/2015/watcher.2015-12-09-13.59.html
 * A lot of exchanges regarding Actions and Workflow management in the Git
-  reviews related to the Watcher glossary: https://review.openstack.org/#/c/246370/
+  reviews related to the Watcher glossary: https://review.opendev.org/#/c/246370/
 
 
 History
diff --git a/specs/ocata-template.rst b/specs/ocata-template.rst
index 0b44ce7..7ca2cbd 100644
--- a/specs/ocata-template.rst
+++ b/specs/ocata-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/pike-template.rst b/specs/pike-template.rst
index 0b44ce7..7ca2cbd 100644
--- a/specs/pike-template.rst
+++ b/specs/pike-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/queens-template.rst b/specs/queens-template.rst
index 0b44ce7..7ca2cbd 100644
--- a/specs/queens-template.rst
+++ b/specs/queens-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/rocky-template.rst b/specs/rocky-template.rst
index 0eeb783..896630b 100644
--- a/specs/rocky-template.rst
+++ b/specs/rocky-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/stein-template.rst b/specs/stein-template.rst
index 0eeb783..896630b 100644
--- a/specs/stein-template.rst
+++ b/specs/stein-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/train-template.rst b/specs/train-template.rst
index d609e5a..6529de3 100644
--- a/specs/train-template.rst
+++ b/specs/train-template.rst
@@ -74,7 +74,7 @@ Some notes about using this template:
   you should add the APIImpact flag to the commit message. Specifications with
   the APIImpact flag can be found with the following query:
 
-  https://review.openstack.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
+  https://review.opendev.org/#/q/status:open+project:openstack/watcher-specs+message:apiimpact,n,z
 
 
 Problem description
diff --git a/specs/train/approved/global-datasource-preference.rst b/specs/train/approved/global-datasource-preference.rst
index 99841bb..c0b7355 100644
--- a/specs/train/approved/global-datasource-preference.rst
+++ b/specs/train/approved/global-datasource-preference.rst
@@ -22,11 +22,11 @@ Problem description
 ===================
 
 The datasources available to Watcher differs per OpenStack deployment so there
-can not be a standard preference that will work for all deployments. Configuring
-which datasources are preferred is essential to correctly deploying Watcher,
-however, the datasource preference needs to be defined per strategy. As a result
-the datasource preference will have to be configured many times which can lead
-to errors and costs more time.
+can not be a standard preference that will work for all deployments.
+Configuring which datasources are preferred is essential to correctly deploying
+Watcher, however, the datasource preference needs to be defined per strategy.
+As a result the datasource preference will have to be configured many times
+which can lead to errors and costs more time.
 
 Use Cases
 ----------
@@ -41,9 +41,9 @@ Proposed change
 ===============
 
 Allow specifying of global datasource order by exposing new configuration
-parameter. This parameter will be part of a new group labeled watcher_datasource
-. The datasource parameter for strategies remains available and overrides
-the globally configured datasources.
+parameter. This parameter will be part of a new group labeled
+watcher_datasource. The datasource parameter for strategies remains available
+and overrides the globally configured datasources.
 
 ::
 
@@ -53,9 +53,9 @@ the globally configured datasources.
 Alternatives
 ------------
 
-Try datasources but ensure that if they are not properly configured an error is
-raised and an alternative datasource is tried. Major downside of this approach
-is that it will create a lot of errors in some scenarios.
+Try datasources but ensure that if they are not properly configured an error
+is raised and an alternative datasource is tried. Major downside of this
+approach is that it will create a lot of errors in some scenarios.
 
 Data model impact
 -----------------
diff --git a/tox.ini b/tox.ini
index 69f942e..cbdaa2e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ skipsdist = True
 basepython=python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
 whitelist_externals = find
 commands =