Merge "Ensure ansible_fqdn is set"
This commit is contained in:
commit
bcb8186af1
|
@ -95,6 +95,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:
|
||||
|
@ -154,6 +157,7 @@ outputs:
|
|||
ipaclient_no_ntp: {get_param: IdMNoNtpSetup}
|
||||
ipaclient_force: yes
|
||||
ipaclient_hostname: "{{ hostvars[outer_item.0]['fqdn_canonical'] }}"
|
||||
ansible_fqdn: "{{ ipaclient_hostname }}"
|
||||
ipaclients:
|
||||
- "{{ outer_item.0 }}"
|
||||
#NOTE(xek): The following is a workaround till ipaclient is fixed to use ansible_facts
|
||||
|
|
|
@ -52,6 +52,9 @@ outputs:
|
|||
package:
|
||||
name: openssl-perl
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue