From 2649c23c52d307088a42a4ee2a5fc0aee90a92cb Mon Sep 17 00:00:00 2001
From: Mark O'Brien <markobri@redhat.com>
Date: Thu, 6 May 2021 12:30:29 +0100
Subject: [PATCH] ipa: add env_suffix for stg

---
 roles/ipa/server/tasks/main.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/roles/ipa/server/tasks/main.yml b/roles/ipa/server/tasks/main.yml
index 14736f3271..0daa13a398 100644
--- a/roles/ipa/server/tasks/main.yml
+++ b/roles/ipa/server/tasks/main.yml
@@ -1,7 +1,5 @@
 ---
 # Configuration for IPA
-#
-# TODO: remove staging tag afetr freeze
 - name: on rhel8 hosts enable the correct idm module
   copy:
     src: "{{item}}"
@@ -11,7 +9,7 @@
     - idm.module
     - pki-core.module
     - pki-deps.module
-  when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat' and env == 'staging'
+  when: ansible_distribution_major_version|int >= 8 and ansible_distribution == 'RedHat'
   tags:
   - ipa/server
   - config
@@ -84,7 +82,7 @@
   when: not ipa_initial
 
 - name: create replica file
-  delegate_to: ipa01.iad2.fedoraproject.org
+  delegate_to: ipa01{{ env_suffix }}.iad2.fedoraproject.org
   command: ipa-replica-prepare
            --password={{ipa_dm_password}}
            {{inventory_hostname}}
@@ -95,7 +93,7 @@
   when: not ipa_initial and ansible_distribution_major_version|int < 8 and not replication_status.stat.exists
 
 - name: retrieve replica file
-  delegate_to: ipa01.iad2.fedoraproject.org
+  delegate_to: ipa01{{ env_suffix }}.iad2.fedoraproject.org
   fetch: src=/var/lib/ipa/replica-info-{{inventory_hostname}}.gpg
          dest=/tmp/ipa_replica_{{inventory_hostname}}.gpg
          flat=yes
@@ -159,7 +157,7 @@
            --force-join
            --log-file=/var/log/ipainstall.log
            --domain={{ipa_realm}}
-           --server=ipa01.iad2.fedoraproject.org
+           --server=ipa01{{ env_suffix }}.iad2.fedoraproject.org
            creates=/etc/ipa/default.conf
   tags:
   - ipa/server