internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-23 09:14:43 +00:00
Code Issues Projects Releases Wiki Activity

Revert "ipa[server,replica,client]: Do not enforce ansible_fqdn as hostname"

Browse Source 
This reverts commit bbaaf1f74c.
This commit is contained in:
Thomas Woerner
2019-04-18 17:56:14 +02:00
parent 832d233380
commit 4d759b64ab
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ipaclient/tasks/install.yml
View File

@@ -35,7 +35,7 @@
domain: "{{ ipaserver_domain | default(ipaclient_domain) | default(omit) }}"
servers: "{{ ipaclient_servers | default(omit) }}"
realm: "{{ ipaserver_realm | default(ipaclient_realm) | default(omit) }}"
hostname: "{{ ipaclient_hostname | default(omit) }}"
hostname: "{{ ipaclient_hostname | default(ansible_fqdn) }}"
ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}"
ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
no_ntp: "{{ ipaclient_no_ntp }}"
@@ -166,8 +166,8 @@
- name: Install - Backup and set hostname
ipaclient_set_hostname:
hostname: "{{ ipaclient_hostname }}"
when: not ipaclient_on_master | bool and ipaclient_hostname is defined
hostname: "{{ result_ipaclient_test.hostname }}"
when: not ipaclient_on_master | bool
- name: Install - Join IPA
ipaclient_join: