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:
parent
dca5b16cb4
commit
1325566bad
|
@ -98,6 +98,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:
|
||||||
|
@ -136,6 +139,12 @@ outputs:
|
||||||
ipaclient_install_packages: {get_param: IdMInstallClientPackages}
|
ipaclient_install_packages: {get_param: IdMInstallClientPackages}
|
||||||
ipaclients:
|
ipaclients:
|
||||||
- "{{ inventory_hostname }}"
|
- "{{ 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:
|
if:
|
||||||
- idm_server_provided
|
- idm_server_provided
|
||||||
|
|
|
@ -59,6 +59,9 @@ outputs:
|
||||||
package:
|
package:
|
||||||
name: ipa-client
|
name: ipa-client
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue