add ipa/client role to the rest of the playbookd for staging

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,

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

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

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

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

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') }

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

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

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

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
   

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

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

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

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,

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

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

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

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

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,

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

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

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,

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,

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

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

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

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

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:

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

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

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

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,

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

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

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,

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

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

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

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,

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

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

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

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

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,

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'" }

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