From ba2a92ed7703273e3b91dc06b1c6c94bcc6c1d02 Mon Sep 17 00:00:00 2001
From: Lewis Denny <ldenny@redhat.com>
Date: Wed, 22 Sep 2021 20:52:40 +1000
Subject: [PATCH] Fix delegate_to to use group rather then undercloud

Using delegate_to: undercloud relies on the director host name
being "undercloud". We should instead delegate to the first
host in the "Undercloud" group.

Change-Id: I3560d27deb316100c3c4bf70c609c7367192d44a
(cherry picked from commit d346aa94bdc30aa89d61f49d81cfea42a197d4a7)
---
 deployment/barbican/barbican-api-container-puppet.yaml | 2 +-
 deployment/ipa/ipaservices-baremetal-ansible.yaml      | 2 +-
 deployment/nova/nova-vnc-proxy-container-puppet.yaml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
index 0ebf1bc0b6..46bd871eb1 100644
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -807,7 +807,7 @@ outputs:
                 import_role:
                   name: lunasa_hsm
                   tasks_from: unregister_client
-                delegate_to: undercloud
+                delegate_to: "{{ groups['Undercloud'] | first }}"
                 vars:
                   - map_merge:
                     - {get_param: LunasaVars}
diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml
index ba52d303be..1e14b8179f 100644
--- a/deployment/ipa/ipaservices-baremetal-ansible.yaml
+++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml
@@ -208,7 +208,7 @@ outputs:
             - name: unregister node from ipa server
               import_role:
                 name: tripleo_ipa_cleanup
-              delegate_to: undercloud
+              delegate_to: "{{ groups['Undercloud'] | first }}"
               vars:
                 tripleo_ipa_keytab: {get_param: IdMNovaKeytab}
                 tripleo_ipa_hosts_to_delete:
diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
index 6413fc590e..2a80b0ea11 100644
--- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml
+++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml
@@ -392,12 +392,12 @@ outputs:
               run_once: true
               changed_when: false
               failed_when: false
-              delegate_to: undercloud
+              delegate_to: "{{ groups['Undercloud'] | first }}"
             - name: Deleting nova-consoleauth
               command: "openstack compute service delete {{ item.ID }}"
               loop: "{{ nova_compute_service_result.stdout | from_yaml | default([]) }}"
               run_once: true
-              delegate_to: undercloud
+              delegate_to: "{{ groups['Undercloud'] | first }}"
               failed_when: false
       external_upgrade_tasks:
         - when: