From bc253e72333a5a22066b47a5076d288f3b849f4b Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 29 Jan 2018 17:46:53 +0100
Subject: [PATCH] ipaserver: Use ipaclient_ prefix for client settings
The client settings are:
ipaclient_mkhomedir
ipaclient_no_ntp
ipaclient_ssh_trust_dns
ipaclient_no_ssh
ipaclient_no_sshd
ipaclient_no_dns_sshfp
---
roles/ipaserver/defaults/main.yml | 12 ++++++------
roles/ipaserver/tasks/install.yml | 24 ++++++++++++------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/roles/ipaserver/defaults/main.yml b/roles/ipaserver/defaults/main.yml
index 4af79109..79f61c2f 100644
--- a/roles/ipaserver/defaults/main.yml
+++ b/roles/ipaserver/defaults/main.yml
@@ -12,12 +12,12 @@ ipaserver_no_pkinit: no
ipaserver_no_ui_redirect: no
### ssl certificate ###
### client ###
-ipaserver_mkhomedir: no
-ipaserver_no_ntp: no
-#ipaserver_ssh_trust_dns: no
-#ipaserver_no_ssh: no
-#ipaserver_no_sshd: no
-#ipaserver_no_dns_sshfp: no
+ipaclient_mkhomedir: no
+ipaclient_no_ntp: no
+#ipaclient_ssh_trust_dns: no
+#ipaclient_no_ssh: no
+#ipaclient_no_sshd: no
+#ipaclient_no_dns_sshfp: no
### certificate system ###
ipaserver_external_ca: no
### dns ###
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index ab20a709..b23e1c47 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -59,7 +59,7 @@
# pkinit_name
### client ###
# mkhomedir
- no_ntp: "{{ ipaserver_no_ntp }}"
+ no_ntp: "{{ ipaclient_no_ntp }}"
# ssh_trust_dns
# no_ssh
# no_sshd
@@ -133,7 +133,7 @@
- name: Install - Setup NTP
ipaserver_setup_ntp:
- when: not ipaserver_no_ntp | bool and (ipaserver_external_cert_files is undefined or ipaserver_external_cert_files|length < 1)
+ when: not ipaclient_no_ntp | bool and (ipaserver_external_cert_files is undefined or ipaserver_external_cert_files|length < 1)
- name: Install - Setup DS
ipaserver_setup_ds:
@@ -323,11 +323,11 @@
# realm: "{{ ipaserver_test.realm }}"
# server: "{{ ipaserver_test.hostname }}"
# hostname: "{{ ipaserver_test.hostname }}"
- # #no_dns_sshfp: "{{ ipaserver_no_dns_sshfp }}"
- # #ssh_trust_dns: "{{ ipaserver_ssh_trust_dns }}"
- # #no_ssh: "{{ ipaserver_no_ssh }}"
- # #no_sshd: "{{ ipaserver_no_sshd }}"
- # mkhomedir: "{{ ipaserver_mkhomedir }}"
+ # #no_dns_sshfp: "{{ ipaclient_no_dns_sshfp }}"
+ # #ssh_trust_dns: "{{ ipaclient_ssh_trust_dns }}"
+ # #no_ssh: "{{ ipaclient_no_ssh }}"
+ # #no_sshd: "{{ ipaclient_no_sshd }}"
+ # mkhomedir: "{{ ipaclient_mkhomedir }}"
- name: Install - Setup client
command: >
@@ -338,12 +338,12 @@
--realm "{{ ipaserver_test.realm }}"
--server "{{ ipaserver_test.hostname }}"
--hostname "{{ ipaserver_test.hostname }}"
- {{ "--mkhomedir" if ipaserver_mkhomedir | bool else "" }}
+ {{ "--mkhomedir" if ipaclient_mkhomedir | bool else "" }}
- # {{ "--no-dns-sshfp" if ipaserver_no_dns_sshfp | bool else "" }}
- # {{ "--ssh-trust-dns" if ipaserver_ssh_trust_dns | bool else "" }}
- # {{ "--no-ssh" if ipaserver_no_ssh | bool else "" }}
- # {{ "--no-sshd" if ipaserver_no_sshd | bool else "" }}
+ # {{ "--no-dns-sshfp" if ipaclient_no_dns_sshfp | bool else "" }}
+ # {{ "--ssh-trust-dns" if ipaclient_ssh_trust_dns | bool else "" }}
+ # {{ "--no-ssh" if ipaclient_no_ssh | bool else "" }}
+ # {{ "--no-sshd" if ipaclient_no_sshd | bool else "" }}
- name: Install - Enable IPA
ipaserver_enable_ipa:
--
GitLab