diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index 8b74b07f2a..f6a5def6a7 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -10,8 +10,8 @@ deployment_type: prod virt_install_command: "{{ virt_install_command_two_nic }}" tcp_ports: [ 80 ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran +primary_auth_source: ipa ipa_host_group: wiki ipa_host_group_desc: Fedora Wiki ipa_client_shell_groups: diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 90fd18ec38..6da119b127 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -23,8 +23,7 @@ - rkhunter - nagios_client - hosts - - { role: ipa/client, when: env == "staging" } - - { role: fas_client, when: env != "staging" } + - ipa/client - collectd/base - apache - fedmsg/base @@ -39,8 +38,6 @@ when: env != "staging" } tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: