From 4fc5f1cc6ec7a3722f518ca12cca50677ac801cb Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 22 Apr 2019 15:24:23 +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: I377ea63827b6f3995ee275fdc466c1b2100eafc7 --- README.rst | 8 ++++---- deliverables.yaml | 6 +++--- doc/source/admin/image-building.rst | 6 +++--- doc/source/contributor/CONTRIBUTING.rst | 4 ++-- kolla/tests/etc/default.conf | 4 ++-- kolla/tests/test_build.py | 2 +- specs/high-availability.rst | 2 +- specs/kubernetes-deployment.rst | 2 +- specs/logging-with-heka.rst | 6 +++--- tox.ini | 6 +++--- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.rst b/README.rst index 994a44a98f..2bb935a567 100644 --- a/README.rst +++ b/README.rst @@ -48,9 +48,9 @@ project. The three deliverables that make up the Kolla project are: ================ ========================================================= Deliverable Repository ================ ========================================================= -kolla https://git.openstack.org/cgit/openstack/kolla -kolla-ansible https://git.openstack.org/cgit/openstack/kolla-ansible -kolla-cli https://git.openstack.org/cgit/openstack/kolla-cli +kolla https://opendev.org/openstack/kolla +kolla-ansible https://opendev.org/openstack/kolla-ansible +kolla-cli https://opendev.org/openstack/kolla-cli ================ ========================================================= The `Docker images `__ @@ -199,7 +199,7 @@ workflow `__. `Launchpad `__. - Attend weekly `meetings `__. -- Contribute `code `__. +- Contribute `code `__. Contributors ============ diff --git a/deliverables.yaml b/deliverables.yaml index 136d8c4c5f..803926170c 100644 --- a/deliverables.yaml +++ b/deliverables.yaml @@ -5,8 +5,8 @@ --- - name: kolla - repository: https://git.openstack.org/cgit/openstack/kolla + repository: https://opendev.org/openstack/kolla - name: kolla-ansible - repository: https://git.openstack.org/cgit/openstack/kolla-ansible + repository: https://opendev.org/openstack/kolla-ansible - name: kolla-cli - repository: https://git.openstack.org/cgit/openstack/kolla-cli + repository: https://opendev.org/openstack/kolla-cli diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst index d1f249ebd2..1f099802bd 100644 --- a/doc/source/admin/image-building.rst +++ b/doc/source/admin/image-building.rst @@ -196,7 +196,7 @@ The ``etc/kolla/kolla-build.conf`` file looks like: [keystone-base] type = git - location = https://git.openstack.org/openstack/keystone + location = https://opendev.org/openstack/keystone reference = stable/mitaka [heat-base] @@ -356,7 +356,7 @@ image, one may want to add the following to the ``template-override`` file: {% extends parent_template %} {% block neutron_server_footer %} - RUN git clone https://git.openstack.org/openstack/networking-cisco \ + RUN git clone https://opendev.org/x/networking-cisco \ && pip --no-cache-dir install networking-cisco {% endblock %} @@ -391,7 +391,7 @@ Continuing with the above example, add the following to [neutron-server-plugin-networking-cisco] type = git - location = https://git.openstack.org/openstack/networking-cisco + location = https://opendev.org/x/networking-cisco reference = master The build will clone the repository, resulting in the following archive diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst index aae2cabd1d..ac08719353 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 Git - `_. Bugs should be filed on + `_. Bugs should be filed on `launchpad `_. #. Please follow OpenStack `Gerrit Workflow @@ -28,7 +28,7 @@ Basics the commit message footer to indicate to reviewers a bug is not required. Please use the existing sandbox repository, available at `sandbox -`_, +`_, for learning, understanding and testing the `Gerrit Workflow `_. diff --git a/kolla/tests/etc/default.conf b/kolla/tests/etc/default.conf index 545953e34b..011de75f42 100644 --- a/kolla/tests/etc/default.conf +++ b/kolla/tests/etc/default.conf @@ -3,12 +3,12 @@ debug=True [neutron-server-plugin-networking-arista] reference = master -location = https://git.openstack.org/openstack/networking-arista +location = https://opendev.org/x/networking-arista type = git [neutron-base-plugin-neutron-fwaas] reference = master -location = https://git.openstack.org/openstack/neutron-fwaas +location = https://opendev.org/openstack/neutron-fwaas type = git [profiles] diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py index 1fe0f27d31..1a0cef8c3f 100644 --- a/kolla/tests/test_build.py +++ b/kolla/tests/test_build.py @@ -316,7 +316,7 @@ class KollaWorkerTest(base.TestCase): expected_plugin = { 'name': 'neutron-server-plugin-networking-arista', 'reference': 'master', - 'source': 'https://git.openstack.org/openstack/networking-arista', + 'source': 'https://opendev.org/x/networking-arista', 'type': 'git' } diff --git a/specs/high-availability.rst b/specs/high-availability.rst index 881a5a8ba4..7407aca01c 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/raw/branch/master/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 e12e28ffaa..9d18a78602 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 @@ -58,7 +58,7 @@ commands = bandit --skip B303 -r docker kolla 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} @@ -66,7 +66,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