From a569f0faf3471250917edc8e43428904b9074a06 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 11:33:08 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Thorough replacement of git.openstack.org URLs with their opendev.org counterparts. Change-Id: I7f5506455ed52e4670b8e428548e931db13b13db --- doc/source/configuration/settings.rst | 8 ++++---- doc/source/contributor/contributing.rst | 10 +++++----- doc/source/contributor/quickstart.rst | 4 ++-- doc/source/contributor/ref/local_conf.rst | 2 +- doc/source/contributor/testing.rst | 2 +- doc/source/install/from-source.rst | 6 +++--- horizon/static/horizon/js/horizon.selenium.js | 2 +- openstack_dashboard/api/neutron.py | 2 +- openstack_dashboard/api/rest/glance.py | 2 +- .../local/local_settings.py.example | 2 +- .../core/trunks/steps/trunk-details.controller.js | 2 +- openstack_dashboard/test/helpers.py | 2 +- ...recate-lbaas-v1-dashboard-1f9c48d7c6997b1f.yaml | 2 +- .../drop-LBaaS-v1-dashboard-d767b0bde5274af5.yaml | 2 +- .../vpnaas-panel-splitout-5783df1675bc984f.yaml | 2 +- tools/abandon_old_reviews.sh | 14 +++++++------- tox.ini | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst index e968b48064..268ea2ab4b 100644 --- a/doc/source/configuration/settings.rst +++ b/doc/source/configuration/settings.rst @@ -519,11 +519,11 @@ If the default template is not suitable for your deployment, you can provide your own clouds.yaml by specifying this setting. The default template is defined as `clouds.yaml.template -`__ +`__ and available context parameters are found in ``_get_openrc_credentials()`` and ``download_clouds_yaml_file()`` functions in `openstack_dashboard/dashboards/project/api_access/views.py -`__. +`__. .. note:: @@ -596,11 +596,11 @@ for authentication, the default ``openrc`` would not be sufficient. You can provide your own clouds.yaml by specifying this setting. The default template is defined as `openrc.sh.template -`__ +`__ and available context parameters are found in ``_get_openrc_credentials()`` and ``download_rc_file()`` functions in `openstack_dashboard/dashboards/project/api_access/views.py -`__. +`__. .. note:: diff --git a/doc/source/contributor/contributing.rst b/doc/source/contributor/contributing.rst index 459a13d796..739f6e2e26 100644 --- a/doc/source/contributor/contributing.rst +++ b/doc/source/contributor/contributing.rst @@ -10,7 +10,7 @@ Before you dive into writing patches, here are some of the basics: * Project page: https://launchpad.net/horizon * Bug tracker: https://bugs.launchpad.net/horizon * Source code: https://github.com/openstack/horizon -* Code review: https://review.openstack.org/#q,status:open+project:openstack/horizon,n,z +* Code review: https://review.opendev.org/#/q/project:openstack/horizon+status:open * Continuous integration: * Jenkins: https://jenkins.openstack.org * Zuul: http://status.openstack.org/zuul @@ -475,8 +475,8 @@ To make a new release of the package, you need to: .. _documentation: https://xstatic.readthedocs.io/en/latest/packaging.html .. _xstatic-release: https://pypi.org/project/xstatic-release/ .. _`Create a new repository under OpenStack`: https://docs.openstack.org/infra/manual/creators.html -.. _`request a release`: https://git.openstack.org/cgit/openstack/releases/tree/README.rst -.. _`releases repository`: https://git.openstack.org/cgit/openstack/releases +.. _`request a release`: https://opendev.org/openstack/releases/src/branch/master/README.rst +.. _`releases repository`: https://opendev.org/openstack/releases .. _`Set up PyPi`: https://docs.openstack.org/infra/manual/creators.html#give-openstack-permission-to-publish-releases .. _global-requirements: https://github.com/openstack/requirements/blob/master/global-requirements.txt @@ -522,8 +522,8 @@ xstatic release: upper-constraints version so that deployers / packagers who don't honor upper-constraints still get compatible versions of the packages. -.. _upper-constraints.txt: https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt -.. _new-release: https://review.openstack.org/#/q/status:open+project:openstack/requirements+branch:master+topic:new-release +.. _upper-constraints.txt: https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt +.. _new-release: https://review.opendev.org/#/q/status:open+project:openstack/requirements+branch:master+topic:new-release HTML diff --git a/doc/source/contributor/quickstart.rst b/doc/source/contributor/quickstart.rst index bd631204b6..b6e5cc63ab 100644 --- a/doc/source/contributor/quickstart.rst +++ b/doc/source/contributor/quickstart.rst @@ -37,11 +37,11 @@ Setup ===== To begin setting up a Horizon development environment simply clone the Horizon -git repository from https://git.openstack.org/cgit/openstack/horizon +git repository from https://opendev.org/openstack/horizon .. code-block:: console - $ git clone https://git.openstack.org/openstack/horizon + $ git clone https://opendev.org/openstack/horizon Next you will need to configure Horizon by adding a ``local_settings.py`` file. A good starting point is to use the example config with the following command, diff --git a/doc/source/contributor/ref/local_conf.rst b/doc/source/contributor/ref/local_conf.rst index 7066712b4f..139da0f776 100644 --- a/doc/source/contributor/ref/local_conf.rst +++ b/doc/source/contributor/ref/local_conf.rst @@ -70,7 +70,7 @@ see https://docs.openstack.org/devstack/latest/ SWIFT_DATA_DIR=$DEST/data/swift # Enable Neutron - enable_plugin neutron https://git.openstack.org/openstack/neutron + enable_plugin neutron https://opendev.org/openstack/neutron # Enable the Trunks extension for Neutron enable_service q-trunk diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index 9f0c380eab..2ca4141ce0 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -77,7 +77,7 @@ with Python 2.7 environment. Check ``requirements.txt`` in horizon repository to know which version of Django is actually used. All other dependencies are as defined by the upper-constraints file at -https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt +https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt You can run a subset of the tests by passing the test path as an argument to tox:: diff --git a/doc/source/install/from-source.rst b/doc/source/install/from-source.rst index f1a7239fb8..56069642fa 100644 --- a/doc/source/install/from-source.rst +++ b/doc/source/install/from-source.rst @@ -22,14 +22,14 @@ Installation .. code-block:: console - $ git clone https://git.openstack.org/openstack/horizon -b stable/ --depth=1 + $ git clone https://opendev.org/openstack/horizon -b stable/ --depth=1 $ cd horizon #. Install the horizon python module into your system .. code-block:: console - $ sudo pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ . + $ sudo pip install -c https://opendev.org/openstack/requirements/raw/branch/stable//upper-constraints.txt . Configuration ============= @@ -185,7 +185,7 @@ Deployment For apache2 web server, you may need to create ``/etc/apache2/sites-available/horizon.conf``. The template in DevStack is a good example of the file. - https://git.openstack.org/cgit/openstack-dev/devstack/tree/files/apache-horizon.template + https://opendev.org/openstack/devstack/src/branch/master/files/apache-horizon.template Or you can automatically generate an apache configuration file. If you previously generated an ``openstack_dashboard/horizon_wsgi.py`` file it will use that, otherwise will default to using ``openstack_dashboard/wsgi.py`` diff --git a/horizon/static/horizon/js/horizon.selenium.js b/horizon/static/horizon/js/horizon.selenium.js index 33151daaf6..628e6c10d4 100644 --- a/horizon/static/horizon/js/horizon.selenium.js +++ b/horizon/static/horizon/js/horizon.selenium.js @@ -19,7 +19,7 @@ integration tests can use to understand what dashboard/panel group is currently open (and whether or not it needs to click it to proceed to some other dashboard/panel group). The need for this code arises from 2 facts: - * since https://review.openstack.org/#/c/209259/ sidebar's expand/collapse + * since https://review.opendev.org/#/c/209259/ sidebar's expand/collapse behavior doesn't rely on JS code (pure CSS instead) - which is good; * to match dashboard/panel group header _before_ the 'li.panel-collapse.in' we need '!' selector which will be supported only in CSS4 (not going soon). diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py index 1edc038c38..80216e53c0 100644 --- a/openstack_dashboard/api/neutron.py +++ b/openstack_dashboard/api/neutron.py @@ -925,7 +925,7 @@ def trunk_update(request, trunk_id, old_trunk, new_trunk): trunk. However it should not know anything about how the old and new are meant to be diffed and sent to neutron. We handle that here. - This code was adapted from Heat, see: https://review.openstack.org/442496 + This code was adapted from Heat, see: https://review.opendev.org/442496 Call #1) Update all changed properties but 'sub_ports'. PUT /v2.0/trunks/TRUNK_ID diff --git a/openstack_dashboard/api/rest/glance.py b/openstack_dashboard/api/rest/glance.py index cafec0c9e5..85bb789444 100644 --- a/openstack_dashboard/api/rest/glance.py +++ b/openstack_dashboard/api/rest/glance.py @@ -150,7 +150,7 @@ class Images(generic.View): Any additional request parameters will be passed through the API as filters. There are v1/v2 complications which are being addressed as a - separate work stream: https://review.openstack.org/#/c/150084/ + separate work stream: https://review.opendev.org/#/c/150084/ """ filters, kwargs = rest_utils.parse_filters_kwargs(request, diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 58cd7b2f27..951cdcf006 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -529,7 +529,7 @@ TIME_ZONE = "UTC" # in the Keystone v3 multi-domain case, policy.v3cloudsample.json. # This file is not included in the Horizon repository by default but can be # found at -# http://git.openstack.org/cgit/openstack/keystone/tree/etc/ \ +# https://opendev.org/openstack/keystone/src/branch/master/etc/ \ # policy.v3cloudsample.json # Having matching policy files on the Horizon and Keystone servers is essential # for normal operation. This holds true for all services and their policy files. diff --git a/openstack_dashboard/static/app/core/trunks/steps/trunk-details.controller.js b/openstack_dashboard/static/app/core/trunks/steps/trunk-details.controller.js index 31d047ad1b..96a7a49837 100644 --- a/openstack_dashboard/static/app/core/trunks/steps/trunk-details.controller.js +++ b/openstack_dashboard/static/app/core/trunks/steps/trunk-details.controller.js @@ -60,7 +60,7 @@ // // We roughly follow the example discussed and presented here: // http://lists.openstack.org/pipermail/openstack-dev/2016-July/099368.html - // https://review.openstack.org/345145 + // https://review.opendev.org/345145 // // Though we deviate a bit in the use of stepModels. The example // has one model object per step, named after the workflow step's diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py index 002336467b..c71a136469 100644 --- a/openstack_dashboard/test/helpers.py +++ b/openstack_dashboard/test/helpers.py @@ -542,7 +542,7 @@ def my_custom_sort(flavor): # Site registry touched by setUp() cleanly. As a workaround, we run # PluginTestCase as a separate test process. Hopefully this workaround has gone # in future. For more detail, see bug 1809983 and -# https://review.openstack.org/#/c/627640/. +# https://review.opendev.org/#/c/627640/. @tag('plugin-test') class PluginTestCase(TestCase): """Test case for testing plugin system of Horizon. diff --git a/releasenotes/notes/deprecate-lbaas-v1-dashboard-1f9c48d7c6997b1f.yaml b/releasenotes/notes/deprecate-lbaas-v1-dashboard-1f9c48d7c6997b1f.yaml index 54a17c1593..8b5a02db4f 100644 --- a/releasenotes/notes/deprecate-lbaas-v1-dashboard-1f9c48d7c6997b1f.yaml +++ b/releasenotes/notes/deprecate-lbaas-v1-dashboard-1f9c48d7c6997b1f.yaml @@ -6,4 +6,4 @@ deprecations: so that operators can upgrade Horizon first. Note that the Dashboard support for LBaaS v2 is provided as a Horizon plugin via `neutron-lbaas-dashboard project - `__. + `__. diff --git a/releasenotes/notes/drop-LBaaS-v1-dashboard-d767b0bde5274af5.yaml b/releasenotes/notes/drop-LBaaS-v1-dashboard-d767b0bde5274af5.yaml index f9f7d17196..6b11b83b89 100644 --- a/releasenotes/notes/drop-LBaaS-v1-dashboard-d767b0bde5274af5.yaml +++ b/releasenotes/notes/drop-LBaaS-v1-dashboard-d767b0bde5274af5.yaml @@ -6,4 +6,4 @@ upgrade: Newton release so that operators can upgrade Horizon first. Note that the Dashboard support for LBaaS v2 is provided as a Horizon plugin via `neutron-lbaas-dashboard project - `__. + `__. diff --git a/releasenotes/notes/vpnaas-panel-splitout-5783df1675bc984f.yaml b/releasenotes/notes/vpnaas-panel-splitout-5783df1675bc984f.yaml index 199d74cfbf..f8b2bd75a3 100644 --- a/releasenotes/notes/vpnaas-panel-splitout-5783df1675bc984f.yaml +++ b/releasenotes/notes/vpnaas-panel-splitout-5783df1675bc984f.yaml @@ -8,4 +8,4 @@ upgrade: To continue to use VPNaaS dashboard, install ``neutron-vpnaas-dashboard`` and set up the horizon plugin configuration file in ``enabled`` directory. For more information, see ``neutron-vpnaas-dashboard`` documentation - https://git.openstack.org/cgit/openstack/neutron-vpnaas-dashboard/tree/doc/source + https://opendev.org/openstack/neutron-vpnaas-dashboard/src/branch/master/doc/source diff --git a/tools/abandon_old_reviews.sh b/tools/abandon_old_reviews.sh index 96c566e51c..7860c7b252 100755 --- a/tools/abandon_old_reviews.sh +++ b/tools/abandon_old_reviews.sh @@ -15,9 +15,9 @@ # # # before you run this modify your .ssh/config to create a -# review.openstack.org entry: +# review.opendev.org entry: # -# Host review.openstack.org +# Host review.opendev.org # User # Port 29418 # @@ -33,13 +33,13 @@ function abandon_review { shift local msg=$@ echo "Abandoning $gitid" - # echo ssh review.openstack.org gerrit review $gitid --abandon --message \"$msg\" - ssh review.openstack.org gerrit review $gitid --abandon --message \"$msg\" + # echo ssh review.opendev.org gerrit review $gitid --abandon --message \"$msg\" + ssh review.opendev.org gerrit review $gitid --abandon --message \"$msg\" } PROJECTS="(project:openstack/horizon OR project:openstack/django_openstack_auth)" -blocked_reviews=$(ssh review.openstack.org "gerrit query --current-patch-set --format json $PROJECTS status:open age:4w label:Code-Review<=-2" | jq .currentPatchSet.revision | grep -v null | sed 's/"//g') +blocked_reviews=$(ssh review.opendev.org "gerrit query --current-patch-set --format json $PROJECTS status:open age:4w label:Code-Review<=-2" | jq .currentPatchSet.revision | grep -v null | sed 's/"//g') blocked_msg=$(cat < 4w with no changes and Jenkins has -1ed -failing_reviews=$(ssh review.openstack.org "gerrit query --current-patch-set --format json $PROJECTS status:open age:4w NOT label:Verified>=1,jenkins" | jq .currentPatchSet.revision | grep -v null | sed 's/"//g') +failing_reviews=$(ssh review.opendev.org "gerrit query --current-patch-set --format json $PROJECTS status:open age:4w NOT label:Verified>=1,jenkins" | jq .currentPatchSet.revision | grep -v null | sed 's/"//g') failing_msg=$(cat <