From b0eb4e6c82781fea48e90088bf1f7b2569f84f5c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 19 Mar 2021 17:25:38 +0100 Subject: [PATCH] ipa/client: enable for nuancier in prod Signed-off-by: Nils Philippsen --- inventory/group_vars/nuancier | 12 ++++++++++++ inventory/group_vars/nuancier_stg | 11 +++++++++++ .../host_vars/nuancier01.iad2.fedoraproject.org | 3 --- .../host_vars/nuancier02.iad2.fedoraproject.org | 2 -- playbooks/groups/nuancier.yml | 4 +--- 5 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 inventory/group_vars/nuancier create mode 100644 inventory/group_vars/nuancier_stg diff --git a/inventory/group_vars/nuancier b/inventory/group_vars/nuancier new file mode 100644 index 0000000000..3a20014062 --- /dev/null +++ b/inventory/group_vars/nuancier @@ -0,0 +1,12 @@ +--- +primary_auth_source: ipa +ipa_host_group: nuancier +ipa_host_group_desc: Supplementary Wallpaper Voting +ipa_client_shell_groups: +- sysadmin-datanommer +- sysadmin-noc +- sysadmin-veteran +ipa_client_sudo_groups: +- sysadmin-datanommer +- sysadmin-noc +- sysadmin-veteran diff --git a/inventory/group_vars/nuancier_stg b/inventory/group_vars/nuancier_stg new file mode 100644 index 0000000000..1bdad3adbf --- /dev/null +++ b/inventory/group_vars/nuancier_stg @@ -0,0 +1,11 @@ +--- +ipa_host_group: nuancier +ipa_host_group_desc: Supplementary Wallpaper Voting +ipa_client_shell_groups: +- sysadmin-datanommer +- sysadmin-noc +- sysadmin-veteran +ipa_client_sudo_groups: +- sysadmin-datanommer +- sysadmin-noc +- sysadmin-veteran diff --git a/inventory/host_vars/nuancier01.iad2.fedoraproject.org b/inventory/host_vars/nuancier01.iad2.fedoraproject.org index 197beff813..5d5bd31322 100644 --- a/inventory/host_vars/nuancier01.iad2.fedoraproject.org +++ b/inventory/host_vars/nuancier01.iad2.fedoraproject.org @@ -15,6 +15,3 @@ wsgi_procs: 2 wsgi_threads: 2 tcp_ports: [ 80 ] - -fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran - diff --git a/inventory/host_vars/nuancier02.iad2.fedoraproject.org b/inventory/host_vars/nuancier02.iad2.fedoraproject.org index c2b4a43703..e51c3b4ee4 100644 --- a/inventory/host_vars/nuancier02.iad2.fedoraproject.org +++ b/inventory/host_vars/nuancier02.iad2.fedoraproject.org @@ -15,5 +15,3 @@ wsgi_procs: 2 wsgi_threads: 2 tcp_ports: [ 80 ] - -fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 758ff2b925..467cb1c243 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -20,8 +20,7 @@ - rkhunter - nagios_client - hosts - - { role: ipa/client, when: env == "staging" } - - { role: fas_client, when: env != "staging" } + - ipa/client - collectd/base - sudo - { role: openvpn/client, @@ -32,7 +31,6 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: