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

2021-02-12 12:42:38 +00:00 · 2021-02-12 12:42:38 +00:00 · fdcd55c176
commit fdcd55c176
parent 4e33f7c5d7
46 changed files with 79 additions and 34 deletions
--- 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,
--- 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
--- 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
--- 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
--- 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
--- 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') }
--- 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
--- 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
--- 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
--- 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
  
--- 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
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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,
--- 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,
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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
--- 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,
--- 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
--- 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
--- 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
--- 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
--- 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,
--- 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'" }
--- 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