From 5e3848ad7b7accb95475e3307ea783e4a8a605d1 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Feb 12 2021 14:22:40 +0000 Subject: add ipa client role to hosts with no fas in staging --- diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 0bcfd48..d64c022 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -17,6 +17,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - sudo - rsyncd diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index e1fff51..8f032f1 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -29,8 +29,8 @@ - nagios_client - collectd/base - hosts - - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - sudo - rkhunter - { role: fedmsg/base, when: env != "staging" } diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 1bac99b..48726e5 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -16,6 +16,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - fedmsg/base - sudo diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml index 857ed39..883f229 100644 --- a/playbooks/groups/certgetter.yml +++ b/playbooks/groups/certgetter.yml @@ -16,6 +16,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - rsyncd - sudo - apache diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 6124ba8..12ef343 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -18,6 +18,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - { role: fedmsg/base, when: deployment_type == "prod" } diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 66deccc..9372bbe 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -21,7 +21,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } - - { role: ipa/client, when: env == "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index f73227b..98622c7 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -17,6 +17,7 @@ - collectd/base - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - rsyncd - sudo - { role: openvpn/client, diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index d713242..f396cf8 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -28,6 +28,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - apache - role: keytab/service diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index 149254e..2279ff6 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -20,6 +20,7 @@ - base - rkhunter - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - nagios_client - hosts - mariadb_server diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index be9b37c..bcc4732 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -16,6 +16,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - collectd/memcached - sudo diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 4e961f0..56579b7 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -16,6 +16,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - sudo - collectd/base - { role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend') } diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index c16dc40..908f122 100644 --- a/playbooks/groups/oci-registry.yml +++ b/playbooks/groups/oci-registry.yml @@ -17,6 +17,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index b21dd93..6f751a9 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -19,6 +19,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - rsyncd - sudo - collectd/base diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 6cab115..3301db2 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -19,6 +19,7 @@ roles: - base - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" }/ - rkhunter - nagios_client - { role: ec2_proxy,