From 647b5e948326613e89a5a0d61efdd2f6b36538d0 Mon Sep 17 00:00:00 2001 From: zhulingjie Date: Tue, 23 Apr 2019 14:24:32 +0800 Subject: [PATCH] Drop use of git.openstack.org Our cgit instance will be going away and opendev.org is the new preferred URL for browsing our git repos. Redirects will exist for the foreseeable future, but it's more efficient to just go directly to the new locations. Change-Id: I7dd9d454da63167832bab02c89be98a2ce03b72a --- README.rst | 2 +- devstack/local.conf.compute | 2 +- devstack/local.conf.controller | 6 +++--- devstack/upgrade/settings | 4 ++-- doc/source/admin/ways-to-install.rst | 2 +- doc/source/contributor/contributing.rst | 2 +- doc/source/contributor/environment.rst | 2 +- doc/source/contributor/testing.rst | 4 ++-- doc/source/index.rst | 6 +++--- tox.ini | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index a24c9c891..d49f80284 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ migration, increased energy efficiency and more! * Free software: Apache license * Wiki: https://wiki.openstack.org/wiki/Watcher -* Source: https://github.com/openstack/watcher +* Source: https://opendev.org/openstack/watcher * Bugs: https://bugs.launchpad.net/watcher * Documentation: https://docs.openstack.org/watcher/latest/ * Release notes: https://docs.openstack.org/releasenotes/watcher/ diff --git a/devstack/local.conf.compute b/devstack/local.conf.compute index 799b9f988..24ec44b28 100644 --- a/devstack/local.conf.compute +++ b/devstack/local.conf.compute @@ -36,7 +36,7 @@ VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP # or HOST_IPV6 NOVA_INSTANCES_PATH=/opt/stack/data/instances # Enable the Ceilometer plugin for the compute agent -enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer +enable_plugin ceilometer https://opendev.org/openstack/ceilometer disable_service ceilometer-acentral,ceilometer-collector,ceilometer-api LOGFILE=$DEST/logs/stack.sh.log diff --git a/devstack/local.conf.controller b/devstack/local.conf.controller index 47450b4a6..b7b34a7c2 100644 --- a/devstack/local.conf.controller +++ b/devstack/local.conf.controller @@ -26,13 +26,13 @@ MULTI_HOST=1 disable_service n-cpu # Enable the Watcher Dashboard plugin -enable_plugin watcher-dashboard https://git.openstack.org/openstack/watcher-dashboard +enable_plugin watcher-dashboard https://opendev.org/openstack/watcher-dashboard # Enable the Watcher plugin -enable_plugin watcher https://git.openstack.org/openstack/watcher +enable_plugin watcher https://opendev.org/openstack/watcher # Enable the Ceilometer plugin -enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer +enable_plugin ceilometer https://opendev.org.org/openstack/ceilometer # This is the controller node, so disable the ceilometer compute agent disable_service ceilometer-acompute diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 300ff09a0..a33ba49fa 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,8 +1,8 @@ register_project_for_upgrade watcher register_db_to_save watcher -devstack_localrc base enable_plugin watcher https://git.openstack.org/openstack/watcher stable/rocky -devstack_localrc target enable_plugin watcher https://git.openstack.org/openstack/watcher +devstack_localrc base enable_plugin watcher https://opendev.org/openstack/watcher stable/rocky +devstack_localrc target enable_plugin watcher https://opendev.org/openstack/watcher devstack_localrc base enable_service watcher-api watcher-decision-engine watcher-applier devstack_localrc target enable_service watcher-api watcher-decision-engine watcher-applier diff --git a/doc/source/admin/ways-to-install.rst b/doc/source/admin/ways-to-install.rst index c34dfae1e..cc0542816 100644 --- a/doc/source/admin/ways-to-install.rst +++ b/doc/source/admin/ways-to-install.rst @@ -92,7 +92,7 @@ these commands: By default, this will show logging on the console from which it was started. Once started, you can use the `Watcher Client`_ to play with Watcher service. -.. _`Watcher Client`: https://git.openstack.org/cgit/openstack/python-watcherclient +.. _`Watcher Client`: https://opendev.org/openstack/python-watcherclient Installing from packages: PyPI -------------------------------- diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst index 2ad6c9d43..3693bafbc 100644 --- a/doc/source/contributor/contributing.rst +++ b/doc/source/contributor/contributing.rst @@ -55,7 +55,7 @@ Wiki https://wiki.openstack.org/Watcher Code Hosting - https://git.openstack.org/cgit/openstack/watcher + https://opendev.org/openstack/watcher Code Review https://review.openstack.org/#/q/status:open+project:openstack/watcher,n,z diff --git a/doc/source/contributor/environment.rst b/doc/source/contributor/environment.rst index e685c990f..e0717245b 100644 --- a/doc/source/contributor/environment.rst +++ b/doc/source/contributor/environment.rst @@ -16,7 +16,7 @@ for development purposes. To install Watcher from packaging, refer instead to Watcher `User Documentation`_. -.. _`Git Repository`: https://git.openstack.org/cgit/openstack/watcher +.. _`Git Repository`: https://opendev.org/openstack/watcher .. _`User Documentation`: https://docs.openstack.org/watcher/latest/ Prerequisites diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index f7060da95..79d072444 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -31,7 +31,7 @@ the following:: $ tox -e pep8 .. _tox: https://tox.readthedocs.org/ -.. _watcher: https://git.openstack.org/cgit/openstack/watcher +.. _watcher: https://opendev.org/openstack/watcher .. _Gerrit: https://review.openstack.org/ If you only want to run specific unit test code and don't like to waste time @@ -48,4 +48,4 @@ Tempest tests Tempest tests for Watcher has been migrated to the external repo `watcher-tempest-plugin`_. -.. _watcher-tempest-plugin: https://git.openstack.org/cgit/openstack/watcher-tempest-plugin +.. _watcher-tempest-plugin: https://opendev.org/openstack/watcher-tempest-plugin diff --git a/doc/source/index.rst b/doc/source/index.rst index 72be52368..700e678eb 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -28,9 +28,9 @@ The documentation provided here is continually kept up-to-date based on the latest code, and may not represent the state of the project at any specific prior release. -.. _watcher: https://git.openstack.org/cgit/openstack/watcher/ -.. _python-watcherclient: https://git.openstack.org/cgit/openstack/python-watcherclient/ -.. _watcher-dashboard: https://git.openstack.org/cgit/openstack/watcher-dashboard/ +.. _watcher: https://opendev.org/openstack/watcher/ +.. _python-watcherclient: https://opendev.org/openstack/python-watcherclient/ +.. _watcher-dashboard: https://opendev.org/openstack/watcher-dashboard/ Developer Guide =============== diff --git a/tox.ini b/tox.ini index 88417786e..0a8c5b926 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ install_command = pip install {opts} {packages} setenv = VIRTUAL_ENV={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}/test-requirements.txt -r{toxinidir}/requirements.txt commands =