diff --git a/doc/source/install/common_configure.txt b/doc/source/install/common_configure.txt
index ab03fda596..32892ef118 100644
--- a/doc/source/install/common_configure.txt
+++ b/doc/source/install/common_configure.txt
@@ -29,7 +29,7 @@
 3. Verify that the ``api-paste.ini`` file is present in ``/etc/trove``.
 
    If the file is not present, you can get it from this
-   `location <http://git.openstack.org/cgit/openstack/trove/plain/etc/trove/api-paste.ini>`__.
+   `location <https://opendev.org/openstack/trove/raw/branch/master/etc/trove/api-paste.ini>`__.
 
 4. Edit the ``trove.conf`` file so it includes appropriate values for the
    settings shown below:
diff --git a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
index d430914ce3..2c4b82023e 100755
--- a/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
+++ b/integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
@@ -9,7 +9,6 @@ set -o xtrace
 source $_LIB/die
 
 BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default}
-ADD_BRANCH=$(basename ${BRANCH_OVERRIDE})
 REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/fedora-requirements.txt
 
 [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
@@ -32,13 +31,12 @@ if [ -f "${DEST}/requirements/${UC_FILE}" ]; then
 else
     UC_DIR=$(pwd)
     UC_BRANCH=${BRANCH_OVERRIDE}
-    if [ "${ADD_BRANCH}" == "default" ]; then
+    if [[ "${UC_BRANCH}" == "default" ]]; then
         UC_BRANCH=master
     fi
 
     set +e
-    curl -o "${UC_DIR}/${UC_FILE}" \
-        https://git.openstack.org/cgit/openstack/requirements/plain/${UC_FILE}?h=${UC_BRANCH}
+    curl -o "${UC_DIR}/${UC_FILE}" "https://opendev.org/openstack/requirements/raw/branch/${UC_BRANCH}/${UC_FILE}"
     set -e
 
     if [ -f "${UC_DIR}/${UC_FILE}" ]; then
diff --git a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
index 7871b786a9..ff2a8b0b9e 100644
--- a/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
+++ b/integration/scripts/files/elements/guest-agent/source-repository-guest-agent
@@ -1,3 +1,3 @@
 # This is used for source-based builds
-guest-agent git /opt/guest-agent https://git.openstack.org/openstack/trove
-upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
+guest-agent git /opt/guest-agent https://opendev.org/openstack/trove
+upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
diff --git a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
index 134acb58b5..f563406a2c 100755
--- a/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
+++ b/integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
@@ -9,7 +9,6 @@ set -o xtrace
 source $_LIB/die
 
 BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default}
-ADD_BRANCH=$(basename ${BRANCH_OVERRIDE})
 REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt
 
 [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
@@ -32,13 +31,12 @@ if [ -f "${DEST}/requirements/${UC_FILE}" ]; then
 else
     UC_DIR=$(pwd)
     UC_BRANCH=${BRANCH_OVERRIDE}
-    if [ "${ADD_BRANCH}" == "default" ]; then
+    if [ "${UC_BRANCH}" == "default" ]; then
         UC_BRANCH=master
     fi
 
     set +e
-    curl -o "${UC_DIR}/${UC_FILE}" \
-        https://git.openstack.org/cgit/openstack/requirements/plain/${UC_FILE}?h=${UC_BRANCH}
+    curl -o "${UC_DIR}/${UC_FILE}" "https://opendev.org/openstack/requirements/raw/branch/${UC_BRANCH}/${UC_FILE}"
     set -e
 
     if [ -f "${UC_DIR}/${UC_FILE}" ]; then
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index 279f9d318e..ed80fa101b 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -56,7 +56,7 @@ PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements
 # Save the state of TROVE_BRANCH first, since it's used in trovestack
 TROVE_BRANCH_ORIG=${TROVE_BRANCH}
 # Devstack and OpenStack git repo source paths, etc.
-GIT_BASE=${GIT_BASE:-https://git.openstack.org}
+GIT_BASE=${GIT_BASE:-https://opendev.org}
 GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
 DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
 TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}
diff --git a/test-upper-constraints.txt b/test-upper-constraints.txt
index debd8e2cdf..fe1a36516e 100644
--- a/test-upper-constraints.txt
+++ b/test-upper-constraints.txt
@@ -1 +1 @@
-git+https://git.openstack.org/openstack/python-troveclient#egg=python-troveclient
+git+https://opendev.org/openstack/python-troveclient#egg=python-troveclient