From 8e16e3a857dcfc1d0db612dbc69e24947f0aeebc Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 10:59:18 +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: Ibe48a4ea537915bc6ce142812354b1d3b3ab1cf7 --- .../v2/samples/metadef-namespaces-list-response.json | 2 +- doc/source/admin/db.rst | 8 ++++---- doc/source/admin/interoperable-image-import.rst | 4 ++-- doc/source/contributor/blueprints.rst | 6 +++--- doc/source/contributor/database_migrations.rst | 4 ++-- doc/source/contributor/release-cpl.rst | 8 ++++---- etc/metadefs/compute-vcputopology.json | 2 +- glance/async_/utils.py | 2 +- glance/db/sqlalchemy/migrate_repo/README | 2 +- tox.ini | 8 ++++---- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/api-ref/source/v2/samples/metadef-namespaces-list-response.json b/api-ref/source/v2/samples/metadef-namespaces-list-response.json index 44462d4dba..0c5984127c 100644 --- a/api-ref/source/v2/samples/metadef-namespaces-list-response.json +++ b/api-ref/source/v2/samples/metadef-namespaces-list-response.json @@ -60,7 +60,7 @@ }, { "created_at": "2014-08-28T17:13:06Z", - "description": "This provides the preferred socket/core/thread counts for the virtual CPU instance exposed to guests. This enables the ability to avoid hitting limitations on vCPU topologies that OS vendors place on their products. See also: http://git.openstack.org/cgit/openstack/nova-specs/tree/specs/juno/virt-driver-vcpu-topology.rst", + "description": "This provides the preferred socket/core/thread counts for the virtual CPU instance exposed to guests. This enables the ability to avoid hitting limitations on vCPU topologies that OS vendors place on their products. See also: https://opendev.org/openstack/nova-specs/src/branch/master/specs/juno/implemented/virt-driver-vcpu-topology.rst", "display_name": "Virtual CPU Topology", "namespace": "OS::Compute::VirtCPUTopology", "owner": "admin", diff --git a/doc/source/admin/db.rst b/doc/source/admin/db.rst index 85334ef953..72865e2153 100644 --- a/doc/source/admin/db.rst +++ b/doc/source/admin/db.rst @@ -74,9 +74,9 @@ migrations: used to do the upgrade to Ocata, is `ocata01_add_visibility_remove_is_public.py`_. -.. _`current directory`: http://git.openstack.org/cgit/openstack/glance/tree/glance/db/sqlalchemy/migrate_repo/versions?h=stable/ocata -.. _`045_add_visibility.py`: http://git.openstack.org/cgit/openstack/glance/tree/glance/db/sqlalchemy/migrate_repo/versions/045_add_visibility.py?h=stable/ocata -.. _`ocata01_add_visibility_remove_is_public.py`: http://git.openstack.org/cgit/openstack/glance/tree/glance/db/sqlalchemy/alembic_migrations/versions/ocata01_add_visibility_remove_is_public.py?h=stable/ocata +.. _`current directory`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/migrate_repo/versions +.. _`045_add_visibility.py`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/migrate_repo/versions/045_add_visibility.py +.. _`ocata01_add_visibility_remove_is_public.py`: https://opendev.org/openstack/glance/src/branch/stable/ocata/glance/db/sqlalchemy/alembic_migrations/versions/ocata01_add_visibility_remove_is_public.py Sync the Database ----------------- @@ -166,7 +166,7 @@ purging the database. `_ contains a discussion of the issue and explains the changes made to the ``glance-manage`` tool for the Rocky release. The `Gerrit review of the - spec `_ contains an extensive + spec `_ contains an extensive discussion of several alternative approaches and will give you an idea of why the Glance team provided a "mitigation" instead of a fix. diff --git a/doc/source/admin/interoperable-image-import.rst b/doc/source/admin/interoperable-image-import.rst index b1b2ae2c7a..72ae045178 100644 --- a/doc/source/admin/interoperable-image-import.rst +++ b/doc/source/admin/interoperable-image-import.rst @@ -458,8 +458,8 @@ You will need to configure 'glance-image-import.conf' file as shown below: [image_conversion] output_format = raw -.. _glance-api.conf: http://git.openstack.org/cgit/openstack/glance/tree/etc/glance-api.conf -.. _glance-image-import.conf.sample: http://git.openstack.org/cgit/openstack/glance/tree/etc/glance-image-import.conf.sample +.. _glance-api.conf: https://opendev.org/openstack/glance/src/branch/master/etc/glance-api.conf +.. _glance-image-import.conf.sample: https://opendev.org/openstack/glance/src/branch/master/etc/glance-image-import.conf.sample .. _`Image Import Refactor`: https://specs.openstack.org/openstack/glance-specs/specs/mitaka/approved/image-import/image-import-refactor.html .. _`Image Service API reference`: https://developer.openstack.org/api-ref/image/ .. _`Inject metadata properties automatically to non-admin images`: https://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/inject-automatic-metadata.html diff --git a/doc/source/contributor/blueprints.rst b/doc/source/contributor/blueprints.rst index a0f64848d3..860e467e13 100644 --- a/doc/source/contributor/blueprints.rst +++ b/doc/source/contributor/blueprints.rst @@ -2,7 +2,7 @@ Blueprints and Specs ==================== The Glance team uses the `glance-specs -`_ repository for its +`_ repository for its specification reviews. Detailed information can be found `here `_. Please also find additional information in the reviews.rst file. @@ -16,7 +16,7 @@ particularly good argument is made in favor of having an exception for it. Please note that we use a `template -`_ +`_ for spec submissions. It is not required to fill out all sections in the template. Review of the spec may require filling in information left out by the submitter. @@ -48,7 +48,7 @@ lite*, which is a quick description of what you want to do. You propose a spec-lite in the same way you propose a full spec: copy the `spec-lite template -`_ +`_ in the **approved** directory for the release cycle in which you're proposing the change, fill out the appropriate sections, and put up a patch in gerrit. diff --git a/doc/source/contributor/database_migrations.rst b/doc/source/contributor/database_migrations.rst index da4f19eb8d..89c1e78601 100644 --- a/doc/source/contributor/database_migrations.rst +++ b/doc/source/contributor/database_migrations.rst @@ -296,7 +296,7 @@ NOTES database upgrades, as a developer you have to pay attention in your scripts to determine whether you need to add/remove triggers in the expand/contract scripts. See the changes to the ocata scripts in - https://review.openstack.org/#/c/544792/ for an example of how to do this. + https://review.opendev.org/#/c/544792/ for an example of how to do this. * Alembic is a database migration engine written for SQLAlchemy. So, any migration script written for SQLAlchemy Migrate should work with Alembic as @@ -354,5 +354,5 @@ References .. [GSPEC2] `Glance Alembic Migrations Spec `_ .. [GMIGS1] `Glance Alembic Migrations Implementation - `_ + `_ .. [ALMBC] `Alembic Operations `_ diff --git a/doc/source/contributor/release-cpl.rst b/doc/source/contributor/release-cpl.rst index b350bc0dab..49492393ad 100644 --- a/doc/source/contributor/release-cpl.rst +++ b/doc/source/contributor/release-cpl.rst @@ -49,7 +49,7 @@ You **do** have to be: possibly even the PTL, shows up right before RC1 with a large but probably innocuous change. Even if this passes the gate, you should err on the side of caution and ask to not allow it to merge. - (This has happened `before `_ ) + (This has happened `before `_ ) A Release CPL has authority within the Glance project. They have authority through two measures: @@ -274,9 +274,9 @@ revised by the Glance Release CPLs: .. _weekly meeting: http://eavesdrop.openstack.org/#Release_Team_Meeting .. _openstack/governance: - https://git.openstack.org/cgit/openstack/governance + https://opendev.org/openstack/governance .. _openstack/releases: - https://git.openstack.org/cgit/openstack/releases + https://opendev.org/openstack/releases .. _StoryBoard: https://storyboard.openstack.org/ .. _glance/db/migration.py: @@ -284,7 +284,7 @@ revised by the Glance Release CPLs: .. _release management process guide: https://docs.openstack.org/project-team-guide/release-management.html .. _release management tooling guide: - http://git.openstack.org/cgit/openstack/releases/tree/README.rst + https://opendev.org/openstack/releases/src/branch/master/README.rst .. _bug tracker: https://bugs.launchpad.net/glance .. _release notes: diff --git a/etc/metadefs/compute-vcputopology.json b/etc/metadefs/compute-vcputopology.json index 345a1c2666..88773f4b18 100644 --- a/etc/metadefs/compute-vcputopology.json +++ b/etc/metadefs/compute-vcputopology.json @@ -1,7 +1,7 @@ { "namespace": "OS::Compute::VirtCPUTopology", "display_name": "Virtual CPU Topology", - "description": "This provides the preferred socket/core/thread counts for the virtual CPU instance exposed to guests. This enables the ability to avoid hitting limitations on vCPU topologies that OS vendors place on their products. See also: http://git.openstack.org/cgit/openstack/nova-specs/tree/specs/juno/virt-driver-vcpu-topology.rst", + "description": "This provides the preferred socket/core/thread counts for the virtual CPU instance exposed to guests. This enables the ability to avoid hitting limitations on vCPU topologies that OS vendors place on their products. See also: https://opendev.org/openstack/nova-specs/src/branch/master/specs/juno/implemented/virt-driver-vcpu-topology.rst", "visibility": "public", "protected": true, "resource_type_associations": [ diff --git a/glance/async_/utils.py b/glance/async_/utils.py index 6a5054ecd8..014d06ef17 100644 --- a/glance/async_/utils.py +++ b/glance/async_/utils.py @@ -67,7 +67,7 @@ class OptionalTask(task.Task): # ourselves we must. # # NOTE(harlowja): The upstream change that is hopefully going to make - # this easier/built-in is at: https://review.openstack.org/#/c/271116/ + # this easier/built-in is at: https://review.opendev.org/#/c/271116/ def wrapper(*args, **kwargs): try: return func(*args, **kwargs) diff --git a/glance/db/sqlalchemy/migrate_repo/README b/glance/db/sqlalchemy/migrate_repo/README index d2c55f6509..ed1537f84f 100644 --- a/glance/db/sqlalchemy/migrate_repo/README +++ b/glance/db/sqlalchemy/migrate_repo/README @@ -1,4 +1,4 @@ This is a database migration repository. More information at -https://git.openstack.org/cgit/openstack/sqlalchemy-migrate/ +https://opendev.org/x/sqlalchemy-migrate/ diff --git a/tox.ini b/tox.ini index 28aed788ba..51db132fa9 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ setenv = # clue for oslo.db to use file-based database. OS_TEST_DBAPI_ADMIN_CONNECTION=sqlite:////tmp/placeholder-never-created-nor-used.db usedevelop = True -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 commands = find . -type f -name "*.pyc" -delete @@ -126,7 +126,7 @@ basepython = python3 # This environment is called from CI scripts to test and publish # the API Ref to developer.openstack.org. 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}/doc/requirements.txt commands = rm -rf api-ref/build @@ -163,7 +163,7 @@ import_exceptions = glance.i18n [testenv:docs] basepython = python3 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}/doc/requirements.txt commands = rm -fr doc/build @@ -177,7 +177,7 @@ commands = {posargs} [testenv:releasenotes] basepython = python3 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}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html