From 41f3a817ac1ebd59d16588b9652956e78cc2936d Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 15:27:35 +0800 Subject: [PATCH] Move to opendev 1.Use opendev.org instead of git.openstack.org. 2.Use review.opendev.org instead of review.openstack.org. You can see the discussion below: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html Change-Id: Ice4509204df788a1a44a06fb89fb44cfe6b54b94 --- README.rst | 2 +- ansible/group_vars/all.yml | 2 +- ansible/roles/horizon/templates/local_settings.j2 | 2 +- ansible/roles/nova/tasks/reload.yml | 2 +- doc/source/contributor/CONTRIBUTING.rst | 4 ++-- doc/source/contributor/vagrant-dev-env.rst | 6 +++--- specs/high-availability.rst | 2 +- specs/kubernetes-deployment.rst | 2 +- specs/logging-with-heka.rst | 6 +++--- tox.ini | 10 +++++----- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.rst b/README.rst index 881fe009f3..f9a42f78cd 100644 --- a/README.rst +++ b/README.rst @@ -147,7 +147,7 @@ workflow `__. `Launchpad `__. - Attend weekly `meetings `__. -- Contribute `code `__. +- Contribute `code `__. Contributors ============ diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 88bcd07f96..d8d6fcbd0a 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -49,7 +49,7 @@ kolla_enable_sanity_cinder: "{{ kolla_enable_sanity_checks }}" kolla_enable_sanity_swift: "{{ kolla_enable_sanity_checks }}" kolla_dev_repos_directory: "/opt/stack/" -kolla_dev_repos_git: "https://git.openstack.org/openstack" +kolla_dev_repos_git: "https://opendev.org/openstack" kolla_dev_repos_pull: "no" kolla_dev_mode: "no" kolla_source_version: "master" diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2 index 7e7f569741..eab5185234 100644 --- a/ansible/roles/horizon/templates/local_settings.j2 +++ b/ansible/roles/horizon/templates/local_settings.j2 @@ -477,7 +477,7 @@ POLICY_FILES_PATH = '/etc/openstack-dashboard' # 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/ \ +# http://opendev.org/openstack/keystone/tree/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/ansible/roles/nova/tasks/reload.yml b/ansible/roles/nova/tasks/reload.yml index 96f57f9681..c00965b438 100644 --- a/ansible/roles/nova/tasks/reload.yml +++ b/ansible/roles/nova/tasks/reload.yml @@ -7,7 +7,7 @@ # "In shutdown, no new events can be scheduled" # To work around this we restart the nova-compute services. # Speaking to the nova team, this seems to be an issue in oslo.service, -# with a fix proposed here: https://review.openstack.org/#/c/641907. +# with a fix proposed here: https://review.opendev.org/#/c/641907. # This issue also seems to affect the proxy services, which exit non-zero in # reponse to a SIGHUP, so restart those too. # TODO(mgoddard): Remove this workaround when this bug has been fixed. diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst index 8b43d36d75..cdbf7ea27d 100644 --- a/doc/source/contributor/CONTRIBUTING.rst +++ b/doc/source/contributor/CONTRIBUTING.rst @@ -8,7 +8,7 @@ Basics ====== #. Our source code is hosted on `OpenStack Kolla-Ansible Git - `_. Bugs should be + `_. Bugs should be filed on `launchpad `_. #. Please follow OpenStack `Gerrit Workflow @@ -35,7 +35,7 @@ Please follow our :doc:`/user/quickstart` to deploy your environment and test your changes. Please use the existing sandbox repository, available at `sandbox -`_, for learning, understanding +`_, for learning, understanding and testing the `Gerrit Workflow `_. diff --git a/doc/source/contributor/vagrant-dev-env.rst b/doc/source/contributor/vagrant-dev-env.rst index 156f3215bb..0da089dd41 100644 --- a/doc/source/contributor/vagrant-dev-env.rst +++ b/doc/source/contributor/vagrant-dev-env.rst @@ -155,9 +155,9 @@ Find a location in the system's home directory and checkout Kolla repos: .. code-block:: console - git clone https://git.openstack.org/openstack/kolla-cli - git clone https://git.openstack.org/openstack/kolla-ansible - git clone https://git.openstack.org/openstack/kolla + git clone https://opendev.org/openstack/kolla-cli + git clone https://opendev.org/openstack/kolla-ansible + git clone https://opendev.org/openstack/kolla All repos must share the same parent directory so the bootstrap code can locate them. diff --git a/specs/high-availability.rst b/specs/high-availability.rst index bc4e01b66d..09067cd0e6 100644 --- a/specs/high-availability.rst +++ b/specs/high-availability.rst @@ -175,7 +175,7 @@ not be reliably deployed in an active/active or active/passive fashion. In general, the Kolla HA environment looks like: -![Image](https://git.openstack.org/cgit/openstack/kolla/plain/specs/ha.svg) +![Image](https://opendev.org/openstack/kolla/plain/specs/ha.svg) Security impact --------------- diff --git a/specs/kubernetes-deployment.rst b/specs/kubernetes-deployment.rst index d5204f223c..f96946e343 100644 --- a/specs/kubernetes-deployment.rst +++ b/specs/kubernetes-deployment.rst @@ -347,6 +347,6 @@ References - [15] http://kubernetes.io/docs/user-guide/node-selection/ - [16] https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/pod-security-context.md - [17] http://blog.kubernetes.io/2015/06/the-distributed-system-toolkit-patterns.html -- [18] https://review.openstack.org/#/admin/groups/460,members +- [18] https://review.opendev.org/#/admin/groups/460,members - [19] https://etherpad.openstack.org/p/kolla-newton-summit-kolla-gate-walkthru - https://github.com/kubernetes/kubernetes diff --git a/specs/logging-with-heka.rst b/specs/logging-with-heka.rst index 7cd7770b31..8087a6a41a 100644 --- a/specs/logging-with-heka.rst +++ b/specs/logging-with-heka.rst @@ -304,10 +304,10 @@ The location of log files on the host will be mentioned in the documentation. References ========== -[1] +[1] [2] [3] -[4] +[4] [5] [6] -[7] +[7] diff --git a/tox.ini b/tox.ini index 48d1a702ea..37c1964a1e 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ usedevelop=True whitelist_externals = find rm install_command = pip install {opts} {packages} -deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY @@ -60,7 +60,7 @@ commands = bandit --skip B303 -r ansible kolla_ansible tests tools [testenv:venv] 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}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -68,7 +68,7 @@ commands = {posargs} [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 = @@ -78,7 +78,7 @@ commands = [testenv:deploy-guide] 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 @@ -95,7 +95,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 =