From 398768ffb13091a9673ed483ad6f72d1b7b47578 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 9 Dec 2019 11:43:47 -0800 Subject: [PATCH] Push OVH region update to production The OVH region updates have been tested with base-test successfully (see https://review.opendev.org/#/c/680178/). With that done push to production so that we are ready for OVH to make their changes later. Change-Id: Icdbe31a8ba00ffe0279a484fe9ccf4d49bfcf4de --- playbooks/base-minimal/post-logs.yaml | 4 ++-- playbooks/base-test/post-logs.yaml | 7 +++++-- playbooks/base/post-logs.yaml | 4 ++-- zuul.d/jobs.yaml | 8 +++----- zuul.d/secrets.yaml | 18 ++---------------- 5 files changed, 14 insertions(+), 27 deletions(-) diff --git a/playbooks/base-minimal/post-logs.yaml b/playbooks/base-minimal/post-logs.yaml index 258529f..73619ec 100644 --- a/playbooks/base-minimal/post-logs.yaml +++ b/playbooks/base-minimal/post-logs.yaml @@ -16,8 +16,8 @@ # used. zuul_log_container: zuul_opendev_logs with_random_choice: - - '{{ opendev_cloud_ovh_bhs1 }}' - - '{{ opendev_cloud_ovh_gra1 }}' + - '{{ opendev_cloud_ovh_bhs }}' + - '{{ opendev_cloud_ovh_gra }}' - '{{ opendev_cloud_rax_dfw }}' - '{{ opendev_cloud_rax_iad }}' - '{{ opendev_cloud_rax_ord }}' diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml index dc19795..8cd7987 100644 --- a/playbooks/base-test/post-logs.yaml +++ b/playbooks/base-test/post-logs.yaml @@ -17,8 +17,11 @@ zuul_log_container: zuul_opendev_logs zuul_log_include_download_script: true with_random_choice: - - '{{ opendev_cloud_test_ovh_bhs }}' - - '{{ opendev_cloud_test_ovh_gra }}' + - '{{ opendev_cloud_ovh_bhs }}' + - '{{ opendev_cloud_ovh_gra }}' + - '{{ opendev_cloud_rax_dfw }}' + - '{{ opendev_cloud_rax_iad }}' + - '{{ opendev_cloud_rax_ord }}' - hosts: localhost # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml index e6b7a08..5949d44 100644 --- a/playbooks/base/post-logs.yaml +++ b/playbooks/base/post-logs.yaml @@ -16,8 +16,8 @@ # used. zuul_log_container: zuul_opendev_logs with_random_choice: - - '{{ opendev_cloud_ovh_bhs1 }}' - - '{{ opendev_cloud_ovh_gra1 }}' + - '{{ opendev_cloud_ovh_bhs }}' + - '{{ opendev_cloud_ovh_gra }}' - '{{ opendev_cloud_rax_dfw }}' - '{{ opendev_cloud_rax_iad }}' - '{{ opendev_cloud_rax_ord }}' diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 6b60bce..72e0cbf 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -65,8 +65,8 @@ nodeset: ubuntu-bionic secrets: &log_clouds - opendev_cloud_fn_one - - opendev_cloud_ovh_bhs1 - - opendev_cloud_ovh_gra1 + - opendev_cloud_ovh_bhs + - opendev_cloud_ovh_gra - opendev_cloud_rax_dfw - opendev_cloud_rax_iad - opendev_cloud_rax_ord @@ -91,9 +91,7 @@ timeout: 1800 post-timeout: 1800 nodeset: ubuntu-bionic - secrets: - - opendev_cloud_test_ovh_bhs - - opendev_cloud_test_ovh_gra + secrets: *log_clouds - job: name: base-minimal diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml index d0e1c6e..ffcb21b 100644 --- a/zuul.d/secrets.yaml +++ b/zuul.d/secrets.yaml @@ -133,7 +133,7 @@ region_name: ca-ymq-1 - secret: - name: opendev_cloud_ovh_bhs1 + name: opendev_cloud_ovh_bhs data: profile: ovh auth: &ovh_auth @@ -170,24 +170,10 @@ jiuTfk8pCtk+D0ok39spyMD2xQ0Uv+tKC7uCx7jClsh3VoX0Msl9AIR/fWpr6IP/hhwRU BXVRn6MwyBOTxfmJxIs2wQcUz4Xsm451FAvr4Cl9yi8cItWDOVwswjS/7Vf3vNvqDLGt5 40Jr3yQEnfaflRscBye6HEg3jooH2xSGdJp/YLN/1T3zzQJDUekFibSV0P/sKc= - region_name: BHS1 - -- secret: - name: opendev_cloud_ovh_gra1 - data: - profile: ovh - auth: *ovh_auth - region_name: GRA1 - -- secret: - name: opendev_cloud_test_ovh_bhs - data: - profile: ovh - auth: *ovh_auth region_name: BHS - secret: - name: opendev_cloud_test_ovh_gra + name: opendev_cloud_ovh_gra data: profile: ovh auth: *ovh_auth