From 4195dcf1194322cff6d51bb55ed59d8bd306351a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 20 Mar 2024 11:54:26 -0700
Subject: [PATCH] Revert "Remove rax from zuul log upload config"

This reverts commit 9d25a857daf959ce52f3d9c64ce38fa54e65ef65.

We revert this as our testing shows the MFA updates to our regular
accounts don't seem to affect swift uploads currently. That may change
when MFA is required across the board on the 26th but we can reapply
this sort of disablement and testing then and in the meantime continue
to have two providers of log upload locations.

Change-Id: I9f24f67253934a6a128a6cee3cceb9c1f0bcdf37
---
 playbooks/base-test/post-logs.yaml | 6 ++----
 playbooks/base/post-logs.yaml      | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/playbooks/base-test/post-logs.yaml b/playbooks/base-test/post-logs.yaml
index 4bc49ca..d530105 100644
--- a/playbooks/base-test/post-logs.yaml
+++ b/playbooks/base-test/post-logs.yaml
@@ -12,10 +12,8 @@
       set_fact:
         _swift_provider_name: "{{ opendev_base_item }}"
       with_random_choice:
-        # Disable ovh to force base-test to use rax to check authentication
-        # details
-        #- 'ovh_bhs'
-        #- 'ovh_gra'
+        - 'ovh_bhs'
+        - 'ovh_gra'
         - 'rax_dfw'
         - 'rax_iad'
         - 'rax_ord'
diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml
index 30687d6..a410c2d 100644
--- a/playbooks/base/post-logs.yaml
+++ b/playbooks/base/post-logs.yaml
@@ -14,10 +14,9 @@
       with_random_choice:
         - 'ovh_bhs'
         - 'ovh_gra'
-        # Temporarily disabled while we update authentication details
-        #- 'rax_dfw'
-        #- 'rax_iad'
-        #- 'rax_ord'
+        - 'rax_dfw'
+        - 'rax_iad'
+        - 'rax_ord'
       loop_control:
         loop_var: 'opendev_base_item'
     - name: Upload swift logs to {{ _swift_provider_name }}