From 49cafcccf41abd5928dd181c5508a444d7025c78 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Fri, 19 Mar 2021 17:25:38 +0100
Subject: [PATCH] ipa/client: enable for notifs in prod

Signed-off-by: Nils Philippsen <nils@redhat.com>
---
 inventory/group_vars/notifs         | 1 +
 inventory/group_vars/notifs_backend | 4 ----
 inventory/group_vars/notifs_web     | 4 ----
 playbooks/groups/notifs-backend.yml | 4 +---
 playbooks/groups/notifs-web.yml     | 3 +--
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/inventory/group_vars/notifs b/inventory/group_vars/notifs
index e24391fe8d..fb58fe0111 100644
--- a/inventory/group_vars/notifs
+++ b/inventory/group_vars/notifs
@@ -1,4 +1,5 @@
 ---
+primary_auth_source: ipa
 ipa_host_group: notifs
 ipa_host_group_desc: Fedora Notifications
 ipa_client_shell_groups:
diff --git a/inventory/group_vars/notifs_backend b/inventory/group_vars/notifs_backend
index 9b74a054d0..a9a8d3cdd4 100644
--- a/inventory/group_vars/notifs_backend
+++ b/inventory/group_vars/notifs_backend
@@ -10,10 +10,6 @@ num_cpus: 8
 
 tcp_ports: [ 3000, 3001, 3002, 3003, 3004, 3005 ]
 
-fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran
-
-sudoers: "{{ private }}/files/sudo/notifs-sudoers"
-
 # For performance measurement.. for now.  This can be removed whenever.
 fedmsg_loglevel: DEBUG
 deployment_type: prod
diff --git a/inventory/group_vars/notifs_web b/inventory/group_vars/notifs_web
index 811c393b3f..b8a4d0eb7d 100644
--- a/inventory/group_vars/notifs_web
+++ b/inventory/group_vars/notifs_web
@@ -13,10 +13,6 @@ wsgi_threads: 2
 
 tcp_ports: [ 80 ]
 
-fas_client_groups: sysadmin-noc,sysadmin-datanommer,sysadmin-veteran
-
-sudoers: "{{ private }}/files/sudo/notifs-sudoers"
-
 deployment_type: prod
 
 # These are consumed by a task in roles/fedmsg/base/main.yml
diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml
index f8b46521d8..46d9891430 100644
--- a/playbooks/groups/notifs-backend.yml
+++ b/playbooks/groups/notifs-backend.yml
@@ -22,8 +22,7 @@
   - base
   - rkhunter
   - hosts
-  - { role: ipa/client, when: env == "staging" }
-  - { role: fas_client, when: env != "staging" }
+  - ipa/client
   - nagios_client
   - collectd/base
   - fedmsg/base
@@ -37,7 +36,6 @@
   #    when: env != "staging" }
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml
index 670e740ec0..d3704eaf78 100644
--- a/playbooks/groups/notifs-web.yml
+++ b/playbooks/groups/notifs-web.yml
@@ -20,7 +20,7 @@
   - rkhunter
   - nagios_client
   - hosts
-  - fas_client
+  - ipa/client
   - collectd/base
   - mod_wsgi
   - role: fedmsg/base
@@ -36,7 +36,6 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
-  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
   - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers: