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
This commit is contained in:
Dave Wilde (d34dh0r53) 2021-04-12 10:38:17 -05:00
parent e48eef930a
commit 30ef4e5729
2 changed files with 7 additions and 0 deletions

View File

@ -95,6 +95,9 @@ outputs:
- name: add the ipa services for this node in step 1 - name: add the ipa services for this node in step 1
when: step|int == 1 when: step|int == 1
block: block:
- name: Ensure ansible_fqdn is defined
set_fact:
ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
- include_role: - include_role:
name: tripleo_ipa_registration name: tripleo_ipa_registration
vars: vars:
@ -154,6 +157,7 @@ outputs:
ipaclient_no_ntp: {get_param: IdMNoNtpSetup} ipaclient_no_ntp: {get_param: IdMNoNtpSetup}
ipaclient_force: yes ipaclient_force: yes
ipaclient_hostname: "{{ hostvars[outer_item.0]['fqdn_canonical'] }}" ipaclient_hostname: "{{ hostvars[outer_item.0]['fqdn_canonical'] }}"
ansible_fqdn: "{{ ipaclient_hostname }}"
ipaclients: ipaclients:
- "{{ outer_item.0 }}" - "{{ outer_item.0 }}"
#NOTE(xek): The following is a workaround till ipaclient is fixed to use ansible_facts #NOTE(xek): The following is a workaround till ipaclient is fixed to use ansible_facts

View File

@ -52,6 +52,9 @@ outputs:
package: package:
name: openssl-perl name: openssl-perl
state: present state: present
- name: Ensure ansible_fqdn is defined
set_fact:
ansible_fqdn: "{{ ansible_facts['fqdn'] }}"
- name: Create tripleo-admin user and group - name: Create tripleo-admin user and group
include_role: include_role:
name: tripleo_create_admin name: tripleo_create_admin