playbooks / staging: adjust playbooks for staging to configure fedmsg if needed

When we setup things we didn't setup fedmsg in iad2 staging.
Now we are using it, so we should configure it until we get rid of it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

filter_plugins/fedmsg.py

@@ -9,7 +9,7 @@ def invert_fedmsg_policy(groups, vars, env):
     """
 
     if env == 'staging':
-        hosts = groups['staging']
+        hosts = groups['staging'] + groups['staging_friendly']
     else:
         hosts = [h for h in groups['all'] if h not in groups['staging']]
 

playbooks/groups/bodhi-backend.yml

@@ -33,7 +33,7 @@
   - { role: ipa/client, when: env == "staging" }
   - sudo
   - rkhunter
-  - { role: fedmsg/base, when: env != "staging" }
+  - fedmsg/base
 
   - role: nfs/client
     mnt_dir: '/mnt/fedora_koji'

playbooks/groups/datagrepper.yml

@@ -20,8 +20,7 @@
   - { role: fas_client, when: env != "staging" }
   - { role: ipa/client, when: env == "staging" }
   - collectd/base
-  - { role: fedmsg/base,
+  - fedmsg/base
-      when: deployment_type == "prod" }
   - { role: rabbit/user,
       username: "datagrepper{{ env_suffix }}"}
   - rsyncd

playbooks/groups/mailman.yml

@@ -99,8 +99,7 @@
     mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
     mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
     mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
-  -  { role: fedmsg/base,
+  - role: fedmsg/base
-       when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user,
       username: "mailman{{ env_suffix }}"}

playbooks/groups/mirrormanager.yml

@@ -102,8 +102,7 @@
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
-  - { role: fedmsg/base,
+  - role: fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user,
       username: "mirrormanager{{ env_suffix }}"}

playbooks/groups/noc.yml

@@ -64,7 +64,7 @@
   - { role: dhcp_server, when: datacenter == 'iad2' }
   - { role: tftp_server, when: datacenter == 'iad2' }
   - { role: nagios_server }
-  - { role: fedmsg/base, when: deployment_type == "prod" and datacenter != 'iad2'}
+  - { role: fedmsg/base }
 
   tasks:
   - name: install some packages which arent in playbooks

playbooks/groups/notifs-backend.yml

@@ -26,8 +26,7 @@
   - { role: fas_client, when: env != "staging" }
   - nagios_client
   - collectd/base
-  - { role: fedmsg/base,
+  - fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user,
       username: "notifs-backend{{ env_suffix }}"}

playbooks/groups/notifs-web.yml

@@ -23,8 +23,7 @@
   - fas_client
   - collectd/base
   - mod_wsgi
-  - { role: fedmsg/base,
+  - role: fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user,
       username: "notifs-web{{ env_suffix }}"}

playbooks/groups/pdc.yml

@@ -46,8 +46,7 @@
   - role: openvpn/client
     when: env != "staging" and datacenter == 'iad2'
   - mod_wsgi
-  - { role: fedmsg/base,
+  - role: fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - role: rabbit/user
     username: "pdc{{ env_suffix }}"

playbooks/groups/resultsdb.yml

@@ -30,8 +30,7 @@
    - { role: openvpn/client,
        when: deployment_type == "prod" }
    - apache
-   - { role: fedmsg/base,
+   - fedmsg/base
-       when: deployment_type == "prod" }
    - { role: dnf-automatic, tags: ['dnfautomatic'] }
    # Set up for fedora-messaging
    - { role: rabbit/user,

playbooks/groups/sundries.yml

@@ -52,8 +52,6 @@
     when: master_sundries_node|bool
   - role: developer/build
     when: master_sundries_node|bool
-  - { role: fedmsg/base,
-      when: master_sundries_node|bool and deployment_type == "prod" }
   - { role: rabbit/user,
       username: "sundries{{ env_suffix }}",
       when: master_sundries_node|bool and deployment_type == "stg" }

playbooks/groups/value.yml

@@ -19,8 +19,7 @@
   - { role: ipa/client, when: env == "staging" }
   - collectd/base
   - apache
-  - { role: fedmsg/base,
+  - fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user,
       username: "value{{ env_suffix }}"}

playbooks/groups/wiki.yml

@@ -27,8 +27,7 @@
   - { role: fas_client, when: env != "staging" }
   - collectd/base
   - apache
-  - { role: fedmsg/base,
+  - fedmsg/base
-      when: deployment_type == "prod" }
   # Set up for fedora-messaging
   - { role: rabbit/user, username: "wiki{{ env_suffix }}", when: inventory_hostname.startswith('wiki01') }
   - { role: rabbit/queue, username: "wiki{{ env_suffix }}", queue_name: "wiki{{ env_suffix }}"}