Merge "Update git.openstack.org to opendev.org"

README.rst

@@ -28,7 +28,7 @@ All this and more, automated from top to bottom using Ansible.
 
 * Free software: Apache license
 * Documentation: https://kayobe.readthedocs.io/en/latest/
-* Source: https://git.openstack.org/cgit/openstack/kayobe
+* Source: https://opendev.org/x/kayobe
 * Bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe
 * Release Notes: https://kayobe-release-notes.readthedocs.io/en/latest/
 * IRC: #openstack-kayobe

ansible/group_vars/all/bifrost

@@ -5,7 +5,7 @@
 # Bifrost installation.
 
 # URL of Bifrost source code repository.
-kolla_bifrost_source_url: "https://git.openstack.org/openstack/bifrost"
+kolla_bifrost_source_url: "https://opendev.org/openstack/bifrost"
 
 # Version (branch, tag, etc.) of Bifrost source code repository. Default is
 # {{ openstack_branch }}.

ansible/group_vars/all/ipa

@@ -8,7 +8,7 @@
 ipa_build_images: False
 
 # URL of IPA source repository.
-ipa_build_source_url: "https://git.openstack.org/openstack/ironic-python-agent"
+ipa_build_source_url: "https://opendev.org/openstack/ironic-python-agent"
 
 # Version of IPA source repository. Default is {{ openstack_branch }}.
 ipa_build_source_version: "{{ openstack_branch }}"

ansible/group_vars/all/kolla

@@ -9,7 +9,7 @@ kolla_ctl_install_type: source
 kolla_source_path: "{{ source_checkout_path ~ '/kolla' }}"
 
 # URL of Kolla source code repository if type is 'source'.
-kolla_source_url: "https://git.openstack.org/openstack/kolla"
+kolla_source_url: "https://opendev.org/openstack/kolla"
 
 # Version (branch, tag, etc.) of Kolla source code repository if type is
 # 'source'. Default is {{ openstack_branch }}.
@@ -31,7 +31,7 @@ kolla_ansible_ctl_install_type: source
 kolla_ansible_source_path: "{{ lookup('env', 'KOLLA_SOURCE_PATH') | default(lookup('env', 'PWD') ~ '/src/kolla-ansible', true) }}"
 
 # URL of Kolla Ansible source code repository if type is 'source'.
-kolla_ansible_source_url: "https://git.openstack.org/openstack/kolla-ansible"
+kolla_ansible_source_url: "https://opendev.org/openstack/kolla-ansible"
 
 # Version (branch, tag, etc.) of Kolla Ansible source code repository if type
 # is 'source'. Default is {{ openstack_branch }}.
@@ -314,7 +314,7 @@ kolla_enable_tls_external: "no"
 kolla_openstack_logging_debug: "False"
 
 # Upper constraints file for installation of Kolla.
-kolla_upper_constraints_file: "https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={{ openstack_branch }}"
+kolla_upper_constraints_file: "https://opendev.org/openstack/requirements/raw/branch/{{ openstack_branch }}/upper-constraints.txt"
 
 # User account to use for Kolla SSH access.
 kolla_ansible_user: kolla

doc/source/configuration/kolla.rst

@@ -42,7 +42,7 @@ installation of Kolla:
     source_checkout_path ~ '/kolla' }}``.
 ``kolla_source_url``
     URL of Kolla source code repository if type is ``source``. Default is
-    https://git.openstack.org/openstack/kolla.
+    https://opendev.org/openstack/kolla.
 ``kolla_source_version``
     Version (branch, tag, etc.) of Kolla source code repository if type is
     ``source``. Default is the same as the Kayobe upstream branch name.
@@ -260,7 +260,7 @@ This will result in Kayobe adding the following configuration to
 
    [bifrost-base]
    type = git
-   location = https://git.openstack.org/openstack/bifrost
+   location = https://opendev.org/openstack/bifrost
    reference = stable/rocky
 
    [ironic-base]

doc/source/development/automated.rst

@@ -16,7 +16,7 @@ The kayobe development environment automation tooling is built using simple
 shell scripts.  Some minimal configuration can be applied by setting the
 environment variables in `dev/config.sh`.  Control plane configuration is
 typically provided via the `kayobe-config-dev
-<https://git.openstack.org/cgit/openstack/kayobe-config-dev>`_ repository,
+<https://opendev.org/x/kayobe-config-dev>`_ repository,
 although it is also possible to use your own kayobe configuration.  This allows
 us to build a development environment that is as close to production as
 possible.
@@ -41,7 +41,7 @@ Preparation
 
 Clone the kayobe repository::
 
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
 
 Change the current directory to the kayobe repository::
 
@@ -50,7 +50,7 @@ Change the current directory to the kayobe repository::
 Clone the ``kayobe-config-dev`` repository to ``config/src/kayobe-config``::
 
     mkdir -p config/src
-    git clone https://git.openstack.org/openstack/kayobe-config-dev.git config/src/kayobe-config
+    git clone https://opendev.org/x/kayobe-config-dev.git config/src/kayobe-config
 
 Inspect the kayobe configuration and make any changes necessary for your
 environment.
@@ -126,7 +126,7 @@ Preparation
 
 Clone the kayobe repository::
 
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
 
 Change to the ``kayobe`` directory::
 
@@ -135,7 +135,7 @@ Change to the ``kayobe`` directory::
 Clone the ``kayobe-config-dev`` repository to ``config/src/kayobe-config``::
 
     mkdir -p config/src
-    git clone https://git.openstack.org/openstack/kayobe-config-dev.git config/src/kayobe-config
+    git clone https://opendev.org/x/kayobe-config-dev.git config/src/kayobe-config
 
 Inspect the kayobe configuration and make any changes necessary for your
 environment.
@@ -177,7 +177,7 @@ nodes.
 
 Clone the tenks repository::
 
-    git clone https://git.openstack.org/openstack/tenks.git
+    git clone https://opendev.org/openstack/tenks.git
 
 Edit the Tenks configuration file, ``dev/tenks-deploy-config-seed.yml``.
 
@@ -214,7 +214,7 @@ The following commands should be executed on the seed hypervisor.
 
 Clone the kayobe repository::
 
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
 
 Change the current directory to the kayobe repository::
 
@@ -266,7 +266,7 @@ The following commands should be executed on the seed hypervisor.
 
 Clone the kayobe repository::
 
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
 
 Change to the ``kayobe`` directory::
 

doc/source/development/releases.rst

@@ -9,7 +9,7 @@ project, it cannot use the official release tooling in the
 ``openstack/releases`` repository.
 
 There are various `useful files
-<http://git.openstack.org/cgit/openstack-infra/project-config/tree/roles/copy-release-tools-scripts/files/release-tools/>`__
+<http://opendev.org/openstack-infra/project-config/src/branch/master/roles/copy-release-tools-scripts/files/release-tools/>`__
 in the ``openstack-infra/project-config`` repository. In particular, see the
 ``release.sh`` and ``make_branch.sh`` scripts.
 

doc/source/development/testing.rst

@@ -52,7 +52,7 @@ git::
 
     # from your home or source directory
     cd ~
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
     cd kayobe
 
 Running Unit and Style Tests

doc/source/development/vagrant.rst

@@ -39,7 +39,7 @@ accessing the VM.
 
 Clone the kayobe repository::
 
-    git clone https://git.openstack.org/openstack/kayobe.git
+    git clone https://opendev.org/x/kayobe.git
 
 Change the current directory to the kayobe repository::
 

doc/source/installation.rst

@@ -120,7 +120,7 @@ code repositories and python virtual environments::
 Next, obtain the Kayobe source code. For example::
 
     $ cd <base_path>/src
-    $ git clone https://git.openstack.org/openstack/kayobe.git
+    $ git clone https://opendev.org/x/kayobe.git
 
 Create a virtualenv for Kayobe::
 

playbooks/kayobe-overcloud-base/overrides.yml.j2

@@ -7,10 +7,10 @@ disable_selinux_do_reboot: false
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla'].src_dir }}"
-kolla_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla'].checkout }}"
-kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}"
-kolla_ansible_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla-ansible'].checkout }}"
+kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
+kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
+kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
+kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
 kolla_upper_constraints_file: "/tmp/upper-constraints.txt"
 kolla_openstack_logging_debug: True
 

playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2

@@ -8,10 +8,10 @@ docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
 {% if not is_previous_release | default(false) %}
-kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla'].src_dir }}"
-kolla_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla'].checkout }}"
-kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}"
-kolla_ansible_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla-ansible'].checkout }}"
+kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
+kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
+kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
+kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
 kolla_upper_constraints_file: "/tmp/upper-constraints.txt"
 {% endif %}
 kolla_openstack_logging_debug: true

playbooks/kayobe-seed-base/overrides.yml.j2

@@ -7,10 +7,10 @@ disable_selinux_do_reboot: false
 docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
-kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla'].src_dir }}"
-kolla_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla'].checkout }}"
-kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}"
-kolla_ansible_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla-ansible'].checkout }}"
+kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
+kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
+kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
+kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
 kolla_upper_constraints_file: "/tmp/upper-constraints.txt"
 kolla_openstack_logging_debug: True
 

playbooks/kayobe-seed-upgrade-base/overrides.yml.j2

@@ -8,10 +8,10 @@ docker_registry_mirrors:
   - "http://{{ zuul_site_mirror_fqdn }}:8082/"
 
 {% if not is_previous_release | default(false) %}
-kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla'].src_dir }}"
-kolla_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla'].checkout }}"
-kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kolla-ansible'].src_dir }}"
-kolla_ansible_source_version: "{{ zuul.projects['git.openstack.org/openstack/kolla-ansible'].checkout }}"
+kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
+kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
+kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
+kolla_ansible_source_version: "{{ zuul.projects['opendev.org/openstack/kolla-ansible'].checkout }}"
 kolla_upper_constraints_file: "/tmp/upper-constraints.txt"
 {% endif %}
 

tox.ini

@@ -18,7 +18,7 @@ setenv =
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
 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}/test-requirements.txt
 commands = stestr run {posargs}
@@ -37,7 +37,7 @@ commands =
 [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}
@@ -60,7 +60,7 @@ commands =
 # Molecule only supports python 2.7 and 3.6.
 basepython = python2
 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
 whitelist_externals =
@@ -113,7 +113,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 = sphinx-build -W -b html doc/source doc/build/html
@@ -125,7 +125,7 @@ commands = oslo_debug_helper {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}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =