From a65511a3d8902fdf84bbb91fd2e86237a43795c5 Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:50:44 +0000 Subject: [PATCH] OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have. --- .gitreview | 4 ++-- playbooks/kayobe-overcloud-base/post.yml | 2 +- playbooks/kayobe-overcloud-base/pre.yml | 6 +++--- playbooks/kayobe-overcloud-base/run.yml | 6 +++--- 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/post.yml | 2 +- playbooks/kayobe-seed-base/pre.yml | 6 +++--- playbooks/kayobe-seed-base/run.yml | 4 ++-- playbooks/kayobe-seed-upgrade-base/post.yml | 2 +- playbooks/kayobe-seed-upgrade-base/pre.yml | 6 +++--- playbooks/kayobe-seed-upgrade-base/run.yml | 4 ++-- zuul.d/jobs.yaml | 16 ++++++++-------- 14 files changed, 38 insertions(+), 38 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/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/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/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/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/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 68a48af7e..39c5cd8eb 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -59,8 +59,8 @@ timeout: 7200 required-projects: # Include kayobe to ensure other projects can use this job. - - name: openstack/kayobe - - name: openstack/kayobe-config-dev + - name: x/kayobe + - name: x/kayobe-config-dev - name: openstack/kolla - name: openstack/kolla-ansible - name: openstack/requirements @@ -92,8 +92,8 @@ timeout: 9000 required-projects: # Include kayobe to ensure other projects can use this job. - - name: openstack/kayobe - - name: openstack/kayobe-config-dev + - name: x/kayobe + - name: x/kayobe-config-dev - name: openstack/kolla - name: openstack/kolla-ansible - name: openstack/requirements @@ -127,8 +127,8 @@ timeout: 5400 required-projects: # Include kayobe to ensure other projects can use this job. - - name: openstack/kayobe - - name: openstack/kayobe-config-dev + - name: x/kayobe + - name: x/kayobe-config-dev - name: openstack/kolla - name: openstack/kolla-ansible - name: openstack/requirements @@ -159,8 +159,8 @@ timeout: 5400 required-projects: # Include kayobe to ensure other projects can use this job. - - name: openstack/kayobe - - name: openstack/kayobe-config-dev + - name: x/kayobe + - name: x/kayobe-config-dev - name: openstack/kolla - name: openstack/kolla-ansible - name: openstack/requirements