From 202715dbc8dc9f90022261b99e4eef47923bc20c 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 odcs in prod Signed-off-by: Nils Philippsen --- inventory/group_vars/odcs | 1 + inventory/group_vars/odcs_backend | 2 -- inventory/group_vars/odcs_frontend | 2 -- playbooks/groups/odcs.yml | 5 +---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/inventory/group_vars/odcs b/inventory/group_vars/odcs index f50edde919..773825fa8f 100644 --- a/inventory/group_vars/odcs +++ b/inventory/group_vars/odcs @@ -1,3 +1,4 @@ +primary_auth_source: ipa ipa_host_group: odcs ipa_host_group_desc: On Demand Compose Service ipa_client_shell_groups: diff --git a/inventory/group_vars/odcs_backend b/inventory/group_vars/odcs_backend index 2fa64ac75e..f008864e8d 100644 --- a/inventory/group_vars/odcs_backend +++ b/inventory/group_vars/odcs_backend @@ -28,8 +28,6 @@ nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran - fedmsg_hub_auto_restart: False # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/odcs_frontend b/inventory/group_vars/odcs_frontend index b33b6cc72d..bd096cd220 100644 --- a/inventory/group_vars/odcs_frontend +++ b/inventory/group_vars/odcs_frontend @@ -21,8 +21,6 @@ udp_ports: [ 111 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.3.163.39 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran - # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: odcs diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index 5d45d85f4e..5acfe54272 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -18,15 +18,12 @@ - rkhunter - nagios_client - hosts - - { role: fas_client, when: env != "staging" } - - { role: ipa/client, when: env == "staging" } + - ipa/client - rsyncd - sudo - collectd/base tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: