internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 20:04:45 +00:00
Code Issues Projects Releases Wiki Activity

ipaclient: Fix misspelled sssd options

Browse Source 
The sssd options in the ipaclient role missed a 's' in the role. The readme
of the role used the proper names with 3 's'. The names in the role have
been fixed and if the old setting are used, they will be used in the first
place.

Also utils/ansible-ipa-client-install has been adaped to use the proper
option names now.

This fixes issue #145 (The ipaclient role misspells sssd)
This commit is contained in:
Thomas Woerner
2019-11-20 12:14:05 +01:00
parent 63924dd6fc
commit 6ad82e6bc7
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/ipaclient/defaults/main.yml
View File

@@ -19,11 +19,11 @@ ipaclient_force_ntpd: no
ipaclient_no_nisdomain: no ipaclient_no_nisdomain: no
ipaclient_configure_firefox: no ipaclient_configure_firefox: no
ipaclient_all_ip_addresses: no ipaclient_all_ip_addresses: no
ipassd_fixed_primary: no ipasssd_fixed_primary: no
ipassd_permit: no ipasssd_permit: no
ipassd_enable_dns_updates: no ipasssd_enable_dns_updates: no
ipassd_no_krb5_offline_passwords: no ipasssd_no_krb5_offline_passwords: no
ipassd_preserve_sssd: no ipasssd_preserve_sssd: no
ipaclient_request_cert: no ipaclient_request_cert: no
### packages ### ### packages ###

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

@@ -51,7 +51,8 @@
all_ip_addresses: "{{ ipaclient_all_ip_addresses }}" all_ip_addresses: "{{ ipaclient_all_ip_addresses }}"
on_master: "{{ ipaclient_on_master }}" on_master: "{{ ipaclient_on_master }}"
### sssd ### ### sssd ###
enable_dns_updates: "{{ ipassd_enable_dns_updates }}" enable_dns_updates: "{{ ipassd_enable_dns_updates
| default(ipasssd_enable_dns_updates) }}"
register: result_ipaclient_test register: result_ipaclient_test
- block: - block:
@@ -259,11 +260,16 @@
no_sshd: "{{ ipaclient_no_sshd }}" no_sshd: "{{ ipaclient_no_sshd }}"
no_sudo: "{{ ipaclient_no_sudo }}" no_sudo: "{{ ipaclient_no_sudo }}"
all_ip_addresses: "{{ ipaclient_all_ip_addresses }}" all_ip_addresses: "{{ ipaclient_all_ip_addresses }}"
fixed_primary: "{{ ipassd_fixed_primary }}" fixed_primary: "{{ ipassd_fixed_primary
permit: "{{ ipassd_permit }}" | default(ipasssd_fixed_primary) }}"
enable_dns_updates: "{{ ipassd_enable_dns_updates }}" permit: "{{ ipassd_permit | default(ipasssd_permit) }}"
preserve_sssd: "{{ ipassd_preserve_sssd }}" enable_dns_updates: "{{ ipassd_enable_dns_updates
no_krb5_offline_passwords: "{{ ipassd_no_krb5_offline_passwords }}" | default(ipasssd_enable_dns_updates) }}"
preserve_sssd: "{{ ipassd_preserve_sssd
| default(ipasssd_preserve_sssd) }}"
no_krb5_offline_passwords:
"{{ ipassd_no_krb5_offline_passwords
| default(ipasssd_no_krb5_offline_passwords) }}"
- name: Install - Configure krb5 for IPA realm - name: Install - Configure krb5 for IPA realm
ipaclient_setup_krb5: ipaclient_setup_krb5:
@@ -310,17 +316,22 @@
ca_enabled: "{{ result_ipaclient_api.ca_enabled }}" ca_enabled: "{{ result_ipaclient_api.ca_enabled }}"
on_master: "{{ ipaclient_on_master }}" on_master: "{{ ipaclient_on_master }}"
dnsok: "{{ result_ipaclient_test.dnsok }}" dnsok: "{{ result_ipaclient_test.dnsok }}"
enable_dns_updates: "{{ ipassd_enable_dns_updates }}" enable_dns_updates: "{{ ipassd_enable_dns_updates
| default(ipasssd_enable_dns_updates) }}"
all_ip_addresses: "{{ ipaclient_all_ip_addresses }}" all_ip_addresses: "{{ ipaclient_all_ip_addresses }}"
ip_addresses: "{{ ipaclient_ip_addresses | default(omit) }}" ip_addresses: "{{ ipaclient_ip_addresses | default(omit) }}"
request_cert: "{{ ipaclient_request_cert }}" request_cert: "{{ ipaclient_request_cert }}"
preserve_sssd: "{{ ipassd_preserve_sssd }}" preserve_sssd: "{{ ipassd_preserve_sssd
| default(ipasssd_preserve_sssd) }}"
no_ssh: "{{ ipaclient_no_ssh }}" no_ssh: "{{ ipaclient_no_ssh }}"
no_sshd: "{{ ipaclient_no_sshd }}" no_sshd: "{{ ipaclient_no_sshd }}"
no_sudo: "{{ ipaclient_no_sudo }}" no_sudo: "{{ ipaclient_no_sudo }}"
fixed_primary: "{{ ipassd_fixed_primary }}" fixed_primary: "{{ ipassd_fixed_primary
permit: "{{ ipassd_permit }}" | default(ipasssd_fixed_primary) }}"
no_krb5_offline_passwords: "{{ ipassd_no_krb5_offline_passwords }}" permit: "{{ ipassd_permit | default(ipasssd_permit) }}"
no_krb5_offline_passwords:
"{{ ipassd_no_krb5_offline_passwords
| default(ipasssd_no_krb5_offline_passwords) }}"
no_dns_sshfp: "{{ ipaclient_no_dns_sshfp }}" no_dns_sshfp: "{{ ipaclient_no_dns_sshfp }}"
- name: Install - Configure SSH and SSHD - name: Install - Configure SSH and SSHD

10
utils/ansible-ipa-client-install
View File

@@ -339,15 +339,15 @@ def main(options, args):
f.write("ipaclient_kinit_attempts=%d\n" % options.kinit_attempts) f.write("ipaclient_kinit_attempts=%d\n" % options.kinit_attempts)
# sssd # sssd
if options.fixed_primary: if options.fixed_primary:
f.write("ipassd_fixed_primary=yes\n") f.write("ipasssd_fixed_primary=yes\n")
if options.permit: if options.permit:
f.write("ipassd_permit=yes\n") f.write("ipasssd_permit=yes\n")
if options.enable_dns_updates: if options.enable_dns_updates:
f.write("ipassd_enable_dns_updates=yes\n") f.write("ipasssd_enable_dns_updates=yes\n")
if options.no_krb5_offline_passwords: if options.no_krb5_offline_passwords:
f.write("ipassd_no_krb5_offline_passwords=yes\n") f.write("ipasssd_no_krb5_offline_passwords=yes\n")
if options.preserve_sssd: if options.preserve_sssd:
f.write("ipassd_preserve_sssd=yes\n") f.write("ipasssd_preserve_sssd=yes\n")
# automount # automount
if options.automount_location: if options.automount_location:
f.write("ipaclient_automount_location=%s\n" % f.write("ipaclient_automount_location=%s\n" %