Skip to content
Snippets Groups Projects
Commit bbaaf1f7 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

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

The ansible_fqdn hostname has been enforced to be set and used in
ipaserver, ipareplica and also ipaclient role. This has been removed as
the hostname should only be set if specified explicitly with
ipa[server,replica,client]_hostname.
parent 2cffd6eb
Branches
Tags
No related merge requests found
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
domain: "{{ ipaserver_domain | default(ipaclient_domain) | default(omit) }}" domain: "{{ ipaserver_domain | default(ipaclient_domain) | default(omit) }}"
servers: "{{ ipaclient_servers | default(omit) }}" servers: "{{ ipaclient_servers | default(omit) }}"
realm: "{{ ipaserver_realm | default(ipaclient_realm) | default(omit) }}" realm: "{{ ipaserver_realm | default(ipaclient_realm) | default(omit) }}"
hostname: "{{ ipaclient_hostname | default(ansible_fqdn) }}" hostname: "{{ ipaclient_hostname | default(omit) }}"
ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}" ntp_servers: "{{ ipaclient_ntp_servers | default(omit) }}"
ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}" ntp_pool: "{{ ipaclient_ntp_pool | default(omit) }}"
no_ntp: "{{ ipaclient_no_ntp }}" no_ntp: "{{ ipaclient_no_ntp }}"
...@@ -166,8 +166,8 @@ ...@@ -166,8 +166,8 @@
- name: Install - Backup and set hostname - name: Install - Backup and set hostname
ipaclient_set_hostname: ipaclient_set_hostname:
hostname: "{{ result_ipaclient_test.hostname }}" hostname: "{{ ipaclient_hostname }}"
when: not ipaclient_on_master | bool when: not ipaclient_on_master | bool and ipaclient_hostname is defined
- name: Install - Join IPA - name: Install - Join IPA
ipaclient_join: ipaclient_join:
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
domain: "{{ ipareplica_domain | default(ipaserver_domain) | default(omit) }}" domain: "{{ ipareplica_domain | default(ipaserver_domain) | default(omit) }}"
servers: "{{ groups.ipaservers | default(groups.ipaserver) | default(omit) }}" servers: "{{ groups.ipaservers | default(groups.ipaserver) | default(omit) }}"
realm: "{{ ipareplica_realm | default(omit) }}" realm: "{{ ipareplica_realm | default(omit) }}"
hostname: "{{ ipareplica_hostname | default(ansible_fqdn) }}" hostname: "{{ ipareplica_hostname | default(omit) }}"
ca_cert_files: "{{ ipareplica_ca_cert_files | default([]) }}" ca_cert_files: "{{ ipareplica_ca_cert_files | default([]) }}"
### server ### ### server ###
setup_adtrust: "{{ ipareplica_setup_adtrust }}" setup_adtrust: "{{ ipareplica_setup_adtrust }}"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}" ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
domain: "{{ ipaserver_domain | default(omit) }}" domain: "{{ ipaserver_domain | default(omit) }}"
realm: "{{ ipaserver_realm | default(omit) }}" realm: "{{ ipaserver_realm | default(omit) }}"
hostname: "{{ ipaserver_hostname | default(ansible_fqdn) }}" hostname: "{{ ipaserver_hostname | default(omit) }}"
ca_cert_files: "{{ ipaserver_ca_cert_files | default(omit) }}" ca_cert_files: "{{ ipaserver_ca_cert_files | default(omit) }}"
no_host_dns: "{{ ipaserver_no_host_dns }}" no_host_dns: "{{ ipaserver_no_host_dns }}"
### server ### ### server ###
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment