From bbaaf1f74c78cc461b41e900ce6d5e0ec1232a90 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 17 Apr 2019 14:43:59 +0200
Subject: [PATCH] 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.
---
roles/ipaclient/tasks/install.yml | 6 +++---
roles/ipareplica/tasks/install.yml | 2 +-
roles/ipaserver/tasks/install.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 606087e0..6434bd1d 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -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(ansible_fqdn) }}"
+ hostname: "{{ ipaclient_hostname | default(omit) }}"
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: "{{ result_ipaclient_test.hostname }}"
- when: not ipaclient_on_master | bool
+ hostname: "{{ ipaclient_hostname }}"
+ when: not ipaclient_on_master | bool and ipaclient_hostname is defined
- name: Install - Join IPA
ipaclient_join:
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 47279a0c..334b745d 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -42,7 +42,7 @@
domain: "{{ ipareplica_domain | default(ipaserver_domain) | default(omit) }}"
servers: "{{ groups.ipaservers | default(groups.ipaserver) | 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([]) }}"
### server ###
setup_adtrust: "{{ ipareplica_setup_adtrust }}"
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index 32374f32..2e652847 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -36,7 +36,7 @@
ip_addresses: "{{ ipaserver_ip_addresses | default([]) }}"
domain: "{{ ipaserver_domain | 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) }}"
no_host_dns: "{{ ipaserver_no_host_dns }}"
### server ###
--
GitLab