From 5d0408c71924c4f7988999d91f73709a9941b0b5 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 10:07:40 +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: I5cfdd0c3e813f1cb6f72087fdb3ee3957b6e9ea7 --- README.rst | 4 ++-- contrib/vagrant/Vagrantfile | 2 +- contrib/vagrant/local.conf | 4 ++-- designate/hacking/checks.py | 2 +- devstack/README.rst | 4 ++-- devstack/upgrade/settings | 4 ++-- doc/source/contributor/devstack.rst | 4 ++-- doc/source/contributor/related.rst | 2 +- doc/source/contributor/ubuntu-dev.rst | 2 +- doc/source/index.rst | 2 +- playbooks/legacy/designate-devstack-agent-base/run.yaml | 8 ++++---- playbooks/legacy/designate-devstack-base/run.yaml | 8 ++++---- tox.ini | 6 +++--- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.rst b/README.rst index 897b3c3a3..0403dbd5a 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ Setup a working environment: .. code-block:: bash - git clone https://git.openstack.org/openstack/designate + git clone https://opendev.org/openstack/designate cd designate virtualenv .venv . .venv/bin/activate @@ -90,7 +90,7 @@ Execute a single test using py27 * Free software: Apache license * Documentation: https://docs.openstack.org/designate/latest/ * Release notes: https://docs.openstack.org/releasenotes/designate/ -* Source: https://git.openstack.org/cgit/openstack/designate +* Source: https://opendev.org/openstack/designate * Bugs: https://bugs.launchpad.net/designate * Blueprints: https://blueprints.launchpad.net/designate diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index 66a64018f..db6cb9182 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile @@ -95,7 +95,7 @@ sudo chown vagrant:vagrant /opt/stack/ # Clone DevStack if [ ! -d "/home/vagrant/devstack" ]; then - git clone https://git.openstack.org/openstack-dev/devstack.git /home/vagrant/devstack + git clone https://opendev.org/openstack/devstack.git /home/vagrant/devstack fi if [ -d "/opt/stack/grenade" ]; then diff --git a/contrib/vagrant/local.conf b/contrib/vagrant/local.conf index 7f1072cbc..338b1aa33 100644 --- a/contrib/vagrant/local.conf +++ b/contrib/vagrant/local.conf @@ -21,7 +21,7 @@ disable_all_services enable_service rabbit mysql key # Enable designate -enable_plugin designate https://git.openstack.org/openstack/designate +enable_plugin designate https://opendev.org/openstack/designate # Designate Devstack Config # ========================= @@ -113,7 +113,7 @@ enable_service designate,designate-central,designate-api,designate-worker,design enable_service tempest # Optional Rally -#enable_plugin rally https://git.openstack.org/openstack/rally.git master +#enable_plugin rally https://opendev.org/openstack/rally.git master # Optional Horizon #enable_service horizon diff --git a/designate/hacking/checks.py b/designate/hacking/checks.py index b9f303f68..e092a0d4d 100644 --- a/designate/hacking/checks.py +++ b/designate/hacking/checks.py @@ -137,7 +137,7 @@ def check_python3_xrange(logical_line): def check_no_log_audit(logical_line): """Ensure that we are not using LOG.audit messages Plans are in place going forward as discussed in the following - spec (https://review.openstack.org/#/c/132552/) to take out + spec (https://review.opendev.org/#/c/132552/) to take out LOG.audit messages. Given that audit was a concept invented for OpenStack we can enforce not using it. """ diff --git a/devstack/README.rst b/devstack/README.rst index f8c873e3c..8893c4412 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -8,13 +8,13 @@ repository. See contrib/vagrant to create a vagrant VM. 1. Download DevStack:: - git clone https://git.openstack.org/openstack-dev/devstack.git + git clone https://opendev.org/openstack/devstack.git cd devstack 2. Add this repo as an external repository:: > cat local.conf [[local|localrc]] - enable_plugin designate https://git.openstack.org/openstack/designate + enable_plugin designate https://opendev.org/openstack/designate 3. run ``stack.sh`` diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index af6949f28..7fe0cbafb 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,8 +1,8 @@ register_project_for_upgrade designate register_db_to_save designate -devstack_localrc base enable_plugin designate https://git.openstack.org/openstack/designate -devstack_localrc target enable_plugin designate https://git.openstack.org/openstack/designate +devstack_localrc base enable_plugin designate https://opendev.org/openstack/designate +devstack_localrc target enable_plugin designate https://opendev.org/openstack/designate devstack_localrc base enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon devstack_localrc target enable_service designate-api designate-central designate-producer designate-worker designate-mdns designate-agent designate-sink designate horizon diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst index fafb8dd6b..ffd1954db 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -28,14 +28,14 @@ Instructions If you want to use local sources for development then you should consider using the contrib/vagrant folder in the - `repository `_. + `repository `_. 1. Get a clean Ubuntu 16.04 VM or newer. DevStack "takes over". Don't use your desktop! 2. Clone DevStack inside the VM:: - $ git clone https://git.openstack.org/openstack-dev/devstack.git + $ git clone https://opendev.org/openstack/devstack.git 3. Move to ``devstack`` directory:: diff --git a/doc/source/contributor/related.rst b/doc/source/contributor/related.rst index b204a6deb..890d7040a 100644 --- a/doc/source/contributor/related.rst +++ b/doc/source/contributor/related.rst @@ -40,7 +40,7 @@ Related Projects .. _Bug Tracker: https://bugs.launchpad.net/designate .. _Blueprints: https://blueprints.launchpad.net/designate -.. _Git: https://git.openstack.org/cgit/openstack/designate +.. _Git: https://opendev.org/openstack/designate .. _Chef Cookbook: https://github.com/moniker-dns/designate-cookbook .. _Debian Packaging: https://github.com/moniker-dns/debian-designate .. _Launchpad PPA: https://launchpad.net/~designate-ppa/+archive/havana diff --git a/doc/source/contributor/ubuntu-dev.rst b/doc/source/contributor/ubuntu-dev.rst index c51801533..7c0bdee44 100644 --- a/doc/source/contributor/ubuntu-dev.rst +++ b/doc/source/contributor/ubuntu-dev.rst @@ -60,7 +60,7 @@ Installing Designate $ mkdir openstack $ cd openstack - $ git clone https://git.openstack.org/openstack/designate.git + $ git clone https://opendev.org/openstack/designate.git $ cd designate diff --git a/doc/source/index.rst b/doc/source/index.rst index 997d884e2..666c916e9 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -24,4 +24,4 @@ For information on the Designate API, see the `API Reference `_. This documentation is generated by the Sphinx toolkit and lives in the -`source tree `_. +`source tree `_. diff --git a/playbooks/legacy/designate-devstack-agent-base/run.yaml b/playbooks/legacy/designate-devstack-agent-base/run.yaml index 95c43efe1..1d532cc4f 100644 --- a/playbooks/legacy/designate-devstack-agent-base/run.yaml +++ b/playbooks/legacy/designate-devstack-agent-base/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -29,7 +29,7 @@ set -x cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] - enable_plugin designate https://git.openstack.org/openstack/designate + enable_plugin designate https://opendev.org/openstack/designate DESIGNATE_SERVICE_PORT_DNS=5322 DESIGNATE_BACKEND_DRIVER=agent DESIGNATE_AGENT_BACKEND_DRIVER={{ backend_driver }} diff --git a/playbooks/legacy/designate-devstack-base/run.yaml b/playbooks/legacy/designate-devstack-base/run.yaml index 92df0aa60..d36f96b23 100644 --- a/playbooks/legacy/designate-devstack-base/run.yaml +++ b/playbooks/legacy/designate-devstack-base/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -43,7 +43,7 @@ export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_TEMPEST_REGEX=designate - export DEVSTACK_LOCAL_CONFIG="enable_plugin designate https://git.openstack.org/openstack/designate" + export DEVSTACK_LOCAL_CONFIG="enable_plugin designate https://opendev.org/openstack/designate" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_SERVICE_PORT_DNS=5322" export DEVSTACK_LOCAL_CONFIG+=$'\n'"DESIGNATE_BACKEND_DRIVER={{ backend }}" diff --git a/tox.ini b/tox.ini index 53b441cc0..249c63093 100644 --- a/tox.ini +++ b/tox.ini @@ -29,7 +29,7 @@ commands = find . -type f -name "*.py[c|o]" -delete rm -f .testrepository/times.dbm deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=master} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt whitelist_externals = @@ -64,7 +64,7 @@ commands = [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}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = @@ -160,7 +160,7 @@ commands = [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}/requirements.txt -r{toxinidir}/doc/requirements.txt commands =