From 28405cb046603c1babad658507c33027e958c47c Mon Sep 17 00:00:00 2001 From: Le Hou Date: Tue, 23 Apr 2019 15:35:09 +0800 Subject: [PATCH] Update to opendev Change-Id: I0d079752c19cba21be6f02caa1aed9b917999495 --- devstack/README.md | 2 +- devstack/local.conf.example | 4 ++-- devstack/upgrade/settings | 4 ++-- doc/source/contributor/dependencies.rst | 2 +- doc/source/contributor/dev.rst | 2 +- doc/source/contributor/devstack.rst | 2 +- doc/source/contributor/getting_involved.rst | 4 ++-- tox.ini | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devstack/README.md b/devstack/README.md index 75db33f9d..f2ce7ee29 100644 --- a/devstack/README.md +++ b/devstack/README.md @@ -15,7 +15,7 @@ where For example - enable_plugin barbican https://git.openstack.org/openstack/barbican stable/liberty + enable_plugin barbican https://opendev.org/openstack/barbican stable/liberty For more information, see the "Externally Hosted Plugins" section of https://docs.openstack.org/devstack/latest/plugins.html diff --git a/devstack/local.conf.example b/devstack/local.conf.example index 1adc363f7..5c3d60d63 100644 --- a/devstack/local.conf.example +++ b/devstack/local.conf.example @@ -1,9 +1,9 @@ [[local|localrc]] disable_all_services -enable_plugin barbican https://git.openstack.org/openstack/barbican +enable_plugin barbican https://opendev.org/openstack/barbican # To use a specific branch: -# enable_plugin barbican https://git.openstack.org/openstack/barbican stable/ +# enable_plugin barbican https://opendev.org/openstack/barbican stable/ enable_service rabbit mysql key diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 70236ee84..6c3dff821 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -23,8 +23,8 @@ devstack_localrc base """ [image-feature-enabled] api_v1=False""" -devstack_localrc base enable_plugin barbican https://git.openstack.org/openstack/barbican -devstack_localrc target enable_plugin barbican https://git.openstack.org/openstack/barbican +devstack_localrc base enable_plugin barbican https://opendev.org/openstack/barbican +devstack_localrc target enable_plugin barbican https://opendev.org/openstack/barbican devstack_localrc base enable_service barbican-svc barbican-retry devstack_localrc target enable_service barbican-svc barbican-retry diff --git a/doc/source/contributor/dependencies.rst b/doc/source/contributor/dependencies.rst index fb7f8b8b9..ea3f4e0dc 100644 --- a/doc/source/contributor/dependencies.rst +++ b/doc/source/contributor/dependencies.rst @@ -22,4 +22,4 @@ If you need to add a new dependency to Barbican, you must edit a few things: fpm and upload it to the cloudkeep yum repo. -.. _`global requirements`: https://git.openstack.org/cgit/openstack/requirements/tree/global-requirements.txt +.. _`global requirements`: https://opendev.org/openstack/requirements/src/branch/master/global-requirements.txt diff --git a/doc/source/contributor/dev.rst b/doc/source/contributor/dev.rst index d17d0b0d4..4b754bfdc 100644 --- a/doc/source/contributor/dev.rst +++ b/doc/source/contributor/dev.rst @@ -51,7 +51,7 @@ installed as well. .. code-block:: bash # Clone barbican source - git clone https://git.openstack.org/openstack/barbican + git clone https://opendev.org/openstack/barbican cd barbican # Create and activate a virtual environment diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst index b998c0f9f..9367547b2 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -115,7 +115,7 @@ Installation .. code-block:: ini - enable_plugin barbican https://git.openstack.org/openstack/barbican + enable_plugin barbican https://opendev.org/openstack/barbican enable_service rabbit mysql key If this is your first time and you do not have a local.conf file, there is diff --git a/doc/source/contributor/getting_involved.rst b/doc/source/contributor/getting_involved.rst index cec359d2e..8d8eb0506 100644 --- a/doc/source/contributor/getting_involved.rst +++ b/doc/source/contributor/getting_involved.rst @@ -64,12 +64,12 @@ storyboard which represents barbican as a repository. Source Repository ------------------- Like other OpenStack related projects, the official Git repository is -available on `git.openstack.org`_; however, the repository is also mirrored +available on `opendev.org`_; however, the repository is also mirrored to GitHub for easier browsing. * `Barbican on GitHub`_ -.. _`git.openstack.org`: https://git.openstack.org/cgit/openstack/barbican +.. _`opendev.org`: https://opendev.org/openstack/barbican .. _`Barbican on GitHub`: https://github.com/openstack/barbican diff --git a/tox.ini b/tox.ini index ec1d9b53f..276577064 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ skipsdist = True setenv = PYTHON=coverage run --source barbican --parallel-mode usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt