diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 6577dfcdc1..4f23deadf5 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -18,7 +18,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: hosts, when: env != "staging" } - sudo - collectd/base - { role: nfs/client, diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index b5cb26ca8a..3baa9b97ee 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -20,7 +20,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - fedmsg/base - sudo diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 043b943fb2..df4423bcc7 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -20,7 +20,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - badges/frontend - fedmsg/base diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index 640a3ec21a..0be00d4be1 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -17,7 +17,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 563f4d0821..76b96d2160 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo - collectd/base - openvpn/server diff --git a/playbooks/groups/bastion_stg.yml b/playbooks/groups/bastion_stg.yml index f41b817e89..6ff1ceb90b 100644 --- a/playbooks/groups/bastion_stg.yml +++ b/playbooks/groups/bastion_stg.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo #- collectd/base #- { role: openvpn/server, when: not inventory_hostname.startswith('bastion-comm01') or inventory_hostname.startswith('bastion13') } diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 0dd416e32e..3bb12b129e 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - ansible-server - sudo - collectd/base diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 2c7482d3b5..7586ccbf24 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -62,7 +62,8 @@ - { role: clevis, when: "inventory_hostname.startswith(('bkernel', 'buildhw-x86'))" } - { role: serial-console, when: inventory_hostname.startswith('bkernel') } - hosts - - { role: fas_client, when: not inventory_hostname.startswith('bkernel') } + - { role: ipa/client, when: not inventory_hostname.startswith('bkernel') and env == "staging" } + - { role: fas_client, when: not inventory_hostname.startswith('bkernel') and env != "staging" } - { role: sudo, when: not inventory_hostname.startswith('bkernel') } - role: keytab/service kt_location: /etc/kojid/kojid.keytab diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index a0c4398fe2..915128f4a2 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -29,6 +29,7 @@ nfs_src_dir: "{{ koji_hub_nfs }}", when: "env == 'staging' or createrepo or 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')", } + - { role: ipa/client, when: not inventory_hostname.startswith('bkernel') and env == "staging" } - { role: fas_client, when: not inventory_hostname.startswith('bkernel') and env == 'production' } - { role: sudo, when: not inventory_hostname.startswith('bkernel') and env == 'production' } - koji_builder diff --git a/playbooks/groups/dbgserver.yml b/playbooks/groups/dbgserver.yml index 44dc84130a..bcbe64ada4 100644 --- a/playbooks/groups/dbgserver.yml +++ b/playbooks/groups/dbgserver.yml @@ -18,7 +18,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo - collectd/base diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index 7cceb367af..3b30474487 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -17,7 +17,8 @@ - hosts - rkhunter - nagios_client - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - collectd/bind - rsyncd diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index bb97b8a641..f0f6b46cae 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -31,7 +31,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - apache - download diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 9520ffc46f..5c5ad249b9 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -16,7 +16,8 @@ roles: - base - rkhunter - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - nagios_client - hosts - collectd/base diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 15393bbec7..0b66610147 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - rsyncd - sudo - { role: openvpn/client, diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 2ab54d59c6..4cf88966d4 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo - collectd/base - gnome_backups diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 3bbbfbe681..5185b6cbe2 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -20,7 +20,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index a09935af28..e28c6fa2c4 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -18,7 +18,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo - collectd/base - apache diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index fcbfd14cb3..a322a75c5c 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - apache - collectd/base - collectd/server diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 82ad9b95e8..65942a78ec 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -19,7 +19,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - sudo - { role: openvpn/client, diff --git a/playbooks/groups/nfs-servers.yml b/playbooks/groups/nfs-servers.yml index aceacdb09f..79b62fb462 100644 --- a/playbooks/groups/nfs-servers.yml +++ b/playbooks/groups/nfs-servers.yml @@ -17,7 +17,8 @@ - base - rkhunter - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - nagios_client - collectd/base - sudo diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 773191b3d9..918cf03da4 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -19,7 +19,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - { role: rsyncd, when: datacenter == 'iad2' } - sudo diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 5f2308b668..61871bf55a 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -22,7 +22,8 @@ - base - rkhunter - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - nagios_client - collectd/base - { role: fedmsg/base, diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index cb2ef25a27..758ff2b925 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -20,7 +20,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - sudo - { role: openvpn/client, diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 37e8a1ba08..e82eb52415 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.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/os-proxies.yml b/playbooks/groups/os-proxies.yml index 9a85444bcc..c9bb352c8c 100644 --- a/playbooks/groups/os-proxies.yml +++ b/playbooks/groups/os-proxies.yml @@ -18,7 +18,8 @@ roles: - base - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - rkhunter - nagios_client - collectd/base diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 8543009613..96830347fd 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -23,7 +23,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index b2f31078f6..2b56eb285c 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - sudo - collectd/base - openvpn/client diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index e2e53c93d1..fdf7d4270f 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -23,6 +23,7 @@ - collectd/base - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - sudo tasks: diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index f7e700a110..5d6a39cd92 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -59,7 +59,8 @@ roles: - base - collectd/base - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - hosts - nagios_client - rkhunter diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 34ea5f5dbf..4bf5558c8d 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -16,6 +16,7 @@ - rkhunter - nagios_client - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - collectd/base - sudo - apache diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 996bed8eda..8d828d43c5 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -24,6 +24,7 @@ - base - rkhunter - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - nagios_client - hosts - postgresql_server diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 3301db2fd6..c0dd27e188 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -19,7 +19,7 @@ roles: - base - { role: fas_client, when: env != "staging" } - - { role: ipa/client, when: env == "staging" }/ + - { role: ipa/client, when: env == "staging" } - rkhunter - nagios_client - { role: ec2_proxy, diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml index 16416c20a0..9cb283b61b 100644 --- a/playbooks/groups/rabbitmq.yml +++ b/playbooks/groups/rabbitmq.yml @@ -19,6 +19,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - collectd/base # RabbitMQ statistics are cluster-wide, only collect them on one member - role: collectd/rabbitmq diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 4e82db5124..03e73fc822 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -24,6 +24,7 @@ - base - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - rkhunter - nagios_client - collectd/base diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml index a229a26dc7..3239a4c5b1 100644 --- a/playbooks/groups/resultsdb.yml +++ b/playbooks/groups/resultsdb.yml @@ -24,6 +24,7 @@ - { role: nagios_client, tags: ['nagios_client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, when: env != "staging", tags: ['fas_client'] } + - { role: ipa/client, when: env == "staging", tags: ['ipa/client'] } - { role: collectd/base, tags: ['collectd_base'] } - { role: sudo, tags: ['sudo'] } - { role: openvpn/client, diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index ffc6300372..8eb1d876b6 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -64,7 +64,8 @@ tasks: - import_role: name=base - import_role: name=hosts - - import_role: name=fas_client + - { import_role: name=ipa/client, when: env == "staging" } + - { import_role: name=fas_client, when: env != "staging" } - import_role: name=rkhunter - import_role: name=nagios_client - import_role: name=openvpn/client diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index c4493c1278..066bfd039a 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - download - rsyncd diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 28ee623365..104596d84b 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -22,6 +22,7 @@ - base - rkhunter - hosts + - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } - sudo - nagios_client diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index c0ef072c8c..88b1d236b9 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -17,7 +17,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - sudo - { role: openvpn/client, diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 5c552b1672..bf0aece957 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -20,6 +20,7 @@ - rkhunter - nagios_client - hosts + - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } - collectd/base - mod_wsgi diff --git a/playbooks/groups/tang.yml b/playbooks/groups/tang.yml index 8c722cd94d..fef1477b85 100644 --- a/playbooks/groups/tang.yml +++ b/playbooks/groups/tang.yml @@ -18,7 +18,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - rsyncd - sudo - tang diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 3043b15eb7..8d1493e74c 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -15,7 +15,8 @@ - hosts - rkhunter - nagios_client - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - rsyncd - sudo diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 56d2e3c5f9..29ab79a899 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -15,7 +15,8 @@ - rkhunter - nagios_client - hosts - - fas_client + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - unbound - sudo diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 4af0bd308b..4bdb3154c6 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -16,6 +16,7 @@ - nagios_client - hosts - { role: fas_client, when: env != "staging" } + - { role: ipa/client, when: env == "staging" } - collectd/base - apache - { role: fedmsg/base, diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 11f4acd1f0..282b942a3c 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -23,7 +23,8 @@ - rkhunter - nagios_client - hosts - - { role: fas_client, when: env != 'staging' } + - { role: ipa/client, when: env == "staging" } + - { role: fas_client, when: env != "staging" } - collectd/base - { role: iscsi_client, when: "inventory_hostname.startswith(('bvirthost', 'buildvmhost-0'))" } - { role: iscsi_client, when: "inventory_hostname.startswith(('bvmhost-x86-06', 'bvmhost-x86-07')) and datacenter == 'iad2'" } diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index c9a8275363..885f6873a9 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -23,6 +23,7 @@ - rkhunter - nagios_client - hosts + - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } - collectd/base - apache