From f24840a56133f8862a521391c1cf14b1f29a0211 Mon Sep 17 00:00:00 2001
From: "Dave Wilde (d34dh0r53)" <cdwilde@gmail.com>
Date: Mon, 12 Apr 2021 10:38:17 -0500
Subject: [PATCH] Ensure ansible_fqdn is set

The ipaclient ansible role requires that ansible_fqdn is defined but
due to [1] we don't have ansible_fqdn inside of ansible_facts.  This
uses the 'fqdn' ansible fact for ansible_fqdn which is equivalent.

[1]: https://opendev.org/openstack/tripleo-heat-templates/commit/4e79336d69e
6b7fa4b026922bac7953bafeee96d

Related-Bug: 1915761
Closes-Bug: 1923248
Change-Id: I0a740e86588c96fff24fa09698c35e492d1c64db
---
 deployment/ipa/ipaservices-baremetal-ansible.yaml | 9 +++++++++
 deployment/tls/undercloud-tls.yaml                | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml
index cfb1a88a3d..08aae7bb1e 100644
--- a/deployment/ipa/ipaservices-baremetal-ansible.yaml
+++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml
@@ -98,6 +98,9 @@ outputs:
         - name: add the ipa services for this node in step 1
           when: step|int == 1
           block:
+            - name: Ensure ansible_fqdn is defined
+              set_fact:
+                ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
             - include_role:
                 name: tripleo_ipa_registration
               vars:
@@ -136,6 +139,12 @@ outputs:
                 ipaclient_install_packages: {get_param: IdMInstallClientPackages}
                 ipaclients:
                   - "{{ inventory_hostname }}"
+                ansible_distribution: "{{ ansible_facts['distribution'] }}"
+                ansible_distribution_major_version: "{{ ansible_facts['distribution_major_version'] }}"
+                ansible_distribution_release: "{{ ansible_facts['distribution_release'] }}"
+                ansible_distribution_version: "{{ ansible_facts['distribution_version'] }}"
+                ansible_os_family: "{{ ansible_facts['os_family'] }}"
+                ansible_fqdn: "{{ ipaclient_hostname }}"
               -
                 if:
                 - idm_server_provided
diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml
index 068fcf23e4..6706e84953 100644
--- a/deployment/tls/undercloud-tls.yaml
+++ b/deployment/tls/undercloud-tls.yaml
@@ -59,6 +59,9 @@ outputs:
           package:
             name: ipa-client
             state: present
+        - name: Ensure ansible_fqdn is defined
+          set_fact:
+            ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
         - name: Create tripleo-admin user and group
           include_role:
             name: tripleo-create-admin