From 5b9f85d715dd18b7a748bbee52980452a432a6d0 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 24 Apr 2019 13:57:43 +0100 Subject: [PATCH] Update git.openstack.org to opendev.org The project infrastructure is now hosted at opendev.org. Kayobe projects have been moved from the openstack/ namespace to x/. Change-Id: I16b523285eb34c1cd0eaf920aa4512d0ae1b4f05 --- .gitreview | 4 ++-- README.rst | 2 +- ansible/group_vars/all/bifrost | 2 +- ansible/group_vars/all/ipa | 2 +- ansible/group_vars/all/kolla | 6 +++--- doc/source/configuration/kolla.rst | 4 ++-- doc/source/development/automated.rst | 16 ++++++++-------- doc/source/development/releases.rst | 2 +- doc/source/development/testing.rst | 2 +- doc/source/development/vagrant.rst | 2 +- doc/source/installation.rst | 2 +- playbooks/kayobe-overcloud-base/overrides.yml.j2 | 8 ++++---- playbooks/kayobe-overcloud-base/post.yml | 2 +- playbooks/kayobe-overcloud-base/pre.yml | 6 +++--- playbooks/kayobe-overcloud-base/run.yml | 6 +++--- .../overrides.yml.j2 | 8 ++++---- playbooks/kayobe-overcloud-upgrade-base/post.yml | 2 +- playbooks/kayobe-overcloud-upgrade-base/pre.yml | 10 +++++----- playbooks/kayobe-overcloud-upgrade-base/run.yml | 6 +++--- playbooks/kayobe-seed-base/overrides.yml.j2 | 8 ++++---- playbooks/kayobe-seed-base/post.yml | 2 +- playbooks/kayobe-seed-base/pre.yml | 6 +++--- playbooks/kayobe-seed-base/run.yml | 4 ++-- .../kayobe-seed-upgrade-base/overrides.yml.j2 | 8 ++++---- playbooks/kayobe-seed-upgrade-base/post.yml | 2 +- playbooks/kayobe-seed-upgrade-base/pre.yml | 6 +++--- playbooks/kayobe-seed-upgrade-base/run.yml | 4 ++-- tox.ini | 10 +++++----- 28 files changed, 71 insertions(+), 71 deletions(-) diff --git a/.gitreview b/.gitreview index 01a2ee536..d2d8c097b 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 -project=openstack/kayobe.git +project=x/kayobe.git diff --git a/README.rst b/README.rst index 0008aea23..2f5007bae 100644 --- a/README.rst +++ b/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 diff --git a/ansible/group_vars/all/bifrost b/ansible/group_vars/all/bifrost index b3dfc3472..8d0be450c 100644 --- a/ansible/group_vars/all/bifrost +++ b/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 }}. diff --git a/ansible/group_vars/all/ipa b/ansible/group_vars/all/ipa index e055710d7..9aee637aa 100644 --- a/ansible/group_vars/all/ipa +++ b/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 }}" diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 7f7549263..0970c0f35 100644 --- a/ansible/group_vars/all/kolla +++ b/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 diff --git a/doc/source/configuration/kolla.rst b/doc/source/configuration/kolla.rst index 1c50326da..3273f4a7c 100644 --- a/doc/source/configuration/kolla.rst +++ b/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] diff --git a/doc/source/development/automated.rst b/doc/source/development/automated.rst index 2dbba0c2d..a23a0f6c0 100644 --- a/doc/source/development/automated.rst +++ b/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 -`_ repository, +`_ 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:: diff --git a/doc/source/development/releases.rst b/doc/source/development/releases.rst index d1a89acf3..5ace24f9c 100644 --- a/doc/source/development/releases.rst +++ b/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 -`__ +`__ in the ``openstack-infra/project-config`` repository. In particular, see the ``release.sh`` and ``make_branch.sh`` scripts. diff --git a/doc/source/development/testing.rst b/doc/source/development/testing.rst index fee94d0f5..961d417c1 100644 --- a/doc/source/development/testing.rst +++ b/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 diff --git a/doc/source/development/vagrant.rst b/doc/source/development/vagrant.rst index fbb91c404..c7970ca3a 100644 --- a/doc/source/development/vagrant.rst +++ b/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:: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 33923360e..b0e174ac8 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -120,7 +120,7 @@ code repositories and python virtual environments:: Next, obtain the Kayobe source code. For example:: $ cd /src - $ git clone https://git.openstack.org/openstack/kayobe.git + $ git clone https://opendev.org/x/kayobe.git Create a virtualenv for Kayobe:: diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index 80b90c8b6..9f6e905a6 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/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 diff --git a/playbooks/kayobe-overcloud-base/post.yml b/playbooks/kayobe-overcloud-base/post.yml index 31dccb283..9faa60fa4 100644 --- a/playbooks/kayobe-overcloud-base/post.yml +++ b/playbooks/kayobe-overcloud-base/post.yml @@ -4,5 +4,5 @@ - role: kayobe-diagnostics kayobe_diagnostics_phase: "post" kayobe_diagnostics_log_dir: "/tmp/logs" - kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" diff --git a/playbooks/kayobe-overcloud-base/pre.yml b/playbooks/kayobe-overcloud-base/pre.yml index 33f8b4cd3..ae07d2a72 100644 --- a/playbooks/kayobe-overcloud-base/pre.yml +++ b/playbooks/kayobe-overcloud-base/pre.yml @@ -2,8 +2,8 @@ - hosts: primary vars: logs_dir: "/tmp/logs" - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" roles: @@ -17,7 +17,7 @@ # the zuul and stack users. - name: Ensure upper-contraints.txt exists copy: - src: "{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" + src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" dest: "/tmp" mode: 0644 remote_src: true diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index 17adde26b..6ddc0cee7 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/playbooks/kayobe-overcloud-base/run.yml @@ -1,10 +1,10 @@ --- - hosts: primary vars: - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" logs_dir: "/tmp/logs" - tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/tenks'].src_dir }}" + tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}" environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" tasks: diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 70c9ed73e..519915797 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/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 diff --git a/playbooks/kayobe-overcloud-upgrade-base/post.yml b/playbooks/kayobe-overcloud-upgrade-base/post.yml index be286660b..8ec489586 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/post.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/post.yml @@ -4,6 +4,6 @@ - role: kayobe-diagnostics kayobe_diagnostics_phase: "post" kayobe_diagnostics_log_dir: "/tmp/logs" - kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" kayobe_diagnostics_previous_config_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" diff --git a/playbooks/kayobe-overcloud-upgrade-base/pre.yml b/playbooks/kayobe-overcloud-upgrade-base/pre.yml index 5d732e313..1923f0663 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/pre.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/pre.yml @@ -2,8 +2,8 @@ - hosts: primary vars: logs_dir: "/tmp/logs" - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}" previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" roles: @@ -17,7 +17,7 @@ # the zuul and stack users. - name: Ensure upper-contraints.txt exists copy: - src: "{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" + src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" dest: "/tmp" mode: 0644 remote_src: true @@ -29,7 +29,7 @@ - name: Ensure previous kayobe repository is cloned git: - repo: https://git.openstack.org/openstack/kayobe + repo: https://opendev.org/x/kayobe dest: "{{ previous_kayobe_src_dir }}" version: "stable/{{ previous_release | lower }}" @@ -40,7 +40,7 @@ - name: Ensure kayobe-config repository is cloned git: - repo: https://git.openstack.org/openstack/kayobe-config-dev + repo: https://opendev.org/x/kayobe-config-dev dest: "{{ previous_kayobe_config_src_dir }}" version: "stable/{{ previous_release | lower }}" diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml index b2cc7755d..4c122db30 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/run.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml @@ -1,12 +1,12 @@ --- - hosts: primary vars: - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}" previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" logs_dir: "/tmp/logs" - tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/tenks'].src_dir }}" + tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}" tasks: # Install the previous release of Kayobe, and use it to deploy a control diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 2aca231e1..347437882 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/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 diff --git a/playbooks/kayobe-seed-base/post.yml b/playbooks/kayobe-seed-base/post.yml index 31dccb283..9faa60fa4 100644 --- a/playbooks/kayobe-seed-base/post.yml +++ b/playbooks/kayobe-seed-base/post.yml @@ -4,5 +4,5 @@ - role: kayobe-diagnostics kayobe_diagnostics_phase: "post" kayobe_diagnostics_log_dir: "/tmp/logs" - kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" diff --git a/playbooks/kayobe-seed-base/pre.yml b/playbooks/kayobe-seed-base/pre.yml index 3fd9bbc1f..1e58fb8d5 100644 --- a/playbooks/kayobe-seed-base/pre.yml +++ b/playbooks/kayobe-seed-base/pre.yml @@ -2,8 +2,8 @@ - hosts: primary vars: logs_dir: "/tmp/logs" - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" roles: @@ -17,7 +17,7 @@ # the zuul and stack users. - name: Ensure upper-contraints.txt exists copy: - src: "{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" + src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" dest: "/tmp" mode: 0644 remote_src: true diff --git a/playbooks/kayobe-seed-base/run.yml b/playbooks/kayobe-seed-base/run.yml index 5f1077313..d4b1fb779 100644 --- a/playbooks/kayobe-seed-base/run.yml +++ b/playbooks/kayobe-seed-base/run.yml @@ -1,8 +1,8 @@ --- - hosts: primary vars: - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" logs_dir: "/tmp/logs" environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" diff --git a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 index 41e6128f8..3339336cb 100644 --- a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 +++ b/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 %} diff --git a/playbooks/kayobe-seed-upgrade-base/post.yml b/playbooks/kayobe-seed-upgrade-base/post.yml index be286660b..8ec489586 100644 --- a/playbooks/kayobe-seed-upgrade-base/post.yml +++ b/playbooks/kayobe-seed-upgrade-base/post.yml @@ -4,6 +4,6 @@ - role: kayobe-diagnostics kayobe_diagnostics_phase: "post" kayobe_diagnostics_log_dir: "/tmp/logs" - kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" kayobe_diagnostics_previous_config_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}" diff --git a/playbooks/kayobe-seed-upgrade-base/pre.yml b/playbooks/kayobe-seed-upgrade-base/pre.yml index 9d225444f..bc9a81b23 100644 --- a/playbooks/kayobe-seed-upgrade-base/pre.yml +++ b/playbooks/kayobe-seed-upgrade-base/pre.yml @@ -15,7 +15,7 @@ # the zuul and stack users. - name: Ensure upper-contraints.txt exists copy: - src: "{{ zuul.projects['git.openstack.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" + src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" dest: "/tmp" mode: 0644 remote_src: true @@ -27,7 +27,7 @@ - name: Ensure previous kayobe repository is cloned git: - repo: https://git.openstack.org/openstack/kayobe + repo: https://opendev.org/x/kayobe dest: "{{ previous_kayobe_src_dir }}" version: "stable/{{ previous_release | lower }}" @@ -38,7 +38,7 @@ - name: Ensure kayobe-config repository is cloned git: - repo: https://git.openstack.org/openstack/kayobe-config-dev + repo: https://opendev.org/x/kayobe-config-dev dest: "{{ previous_kayobe_config_src_dir }}" version: "stable/{{ previous_release | lower }}" diff --git a/playbooks/kayobe-seed-upgrade-base/run.yml b/playbooks/kayobe-seed-upgrade-base/run.yml index aae52b392..41b26e20b 100644 --- a/playbooks/kayobe-seed-upgrade-base/run.yml +++ b/playbooks/kayobe-seed-upgrade-base/run.yml @@ -1,8 +1,8 @@ --- - hosts: primary vars: - kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe'].src_dir }}" - kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['git.openstack.org/openstack/kayobe-config-dev'].src_dir }}" + kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}" + kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}" previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}" previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" logs_dir: "/tmp/logs" diff --git a/tox.ini b/tox.ini index affaef9fd..8d198869d 100644 --- a/tox.ini +++ b/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 =