From e90ccc11cfb31f3fe95fd0a82f4b242354b98965 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 8 Jun 2020 07:49:14 -0700
Subject: [PATCH] iad2 move: more rabbitmq adjustments

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 playbooks/groups/batcave.yml                   |  2 +-
 playbooks/openshift-apps/messaging-bridges.yml |  4 ++--
 roles/bodhi2/base/tasks/main.yml               | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml
index 0a78d957f4..2dc4a28c62 100644
--- a/playbooks/groups/batcave.yml
+++ b/playbooks/groups/batcave.yml
@@ -66,7 +66,7 @@
     thresholds:
       warning: 10
       critical: 100
-    when: datacenter != 'iad2'
+    when: datacenter == 'iad2'
   - batcave
   - role: grobisplitter
     when: datacenter == 'iad2'
diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index bcb2966f9d..132c0b05e4 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -1,7 +1,7 @@
 # Create the RabbitMQ users
 
 - name: setup RabbitMQ
-  hosts: rabbitmq[0]:rabbitmq_stg[0]
+  hosts: rabbitmq[0]:rabbitmq_stg[0]:rabbitmq01.iad2.fedoraproject.org
   user: root
   gather_facts: False
 
@@ -76,7 +76,7 @@
 # Now create the app
 
 - name: make the app be real
-  hosts: os_masters[0]:os_masters_stg[0]
+  hosts: os_masters[0]:os_masters_stg[0]:os-master01.iad2.fedoraproject.org
   user: root
   gather_facts: False
 
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index 7caa1f2563..9cb4c6c2d1 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -37,7 +37,7 @@
 
 - name: Configure the bodhi virtual host
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_vhost:
     name: /bodhi
     state: present
@@ -48,7 +48,7 @@
 
 - name: Configure the HA policy for the bodhi queues
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_policy:
     name: HA
     apply_to: queues
@@ -65,7 +65,7 @@
 
 - name: Grant the admin user access to the bodhi vhost
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_user:
     user: admin
     vhost: /bodhi
@@ -80,7 +80,7 @@
 
 - name: Grant the nagios-monitoring user access to the bodhi vhost
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_user:
     user: nagios-monitoring
     vhost: /bodhi
@@ -111,7 +111,7 @@
 
 - name: Grant the bodhi user access to the bodhi vhost
   run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.{{ datacenter }}.fedoraproject.org"
+  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
   rabbitmq_user:
     user: "bodhi{{ env_suffix }}"
     vhost: /bodhi