diff --git a/filter_plugins/fedmsg.py b/filter_plugins/fedmsg.py index 938d4e77dd..16773cee12 100644 --- a/filter_plugins/fedmsg.py +++ b/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']] diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 115a13be79..9c838ec7fc 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/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' diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index a0c17ec42e..681786b125 100644 --- a/playbooks/groups/datagrepper.yml +++ b/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, - when: deployment_type == "prod" } + - fedmsg/base - { role: rabbit/user, username: "datagrepper{{ env_suffix }}"} - rsyncd diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 65942a78ec..8d6b3a2dd1 100644 --- a/playbooks/groups/mailman.yml +++ b/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, - when: deployment_type == "prod" } + - role: fedmsg/base # Set up for fedora-messaging - { role: rabbit/user, username: "mailman{{ env_suffix }}"} diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 28f1b8630d..bc3cda8658 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -102,8 +102,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - { role: fedmsg/base, - when: deployment_type == "prod" } + - role: fedmsg/base # Set up for fedora-messaging - { role: rabbit/user, username: "mirrormanager{{ env_suffix }}"} diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 918cf03da4..ce68a419dd 100644 --- a/playbooks/groups/noc.yml +++ b/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 diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 61871bf55a..f8b46521d8 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -26,8 +26,7 @@ - { role: fas_client, when: env != "staging" } - nagios_client - collectd/base - - { role: fedmsg/base, - when: deployment_type == "prod" } + - fedmsg/base # Set up for fedora-messaging - { role: rabbit/user, username: "notifs-backend{{ env_suffix }}"} diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 2a6ca86683..670e740ec0 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -23,8 +23,7 @@ - fas_client - collectd/base - mod_wsgi - - { role: fedmsg/base, - when: deployment_type == "prod" } + - role: fedmsg/base # Set up for fedora-messaging - { role: rabbit/user, username: "notifs-web{{ env_suffix }}"} diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index fdf7d4270f..c65b64a9a1 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -46,8 +46,7 @@ - role: openvpn/client when: env != "staging" and datacenter == 'iad2' - mod_wsgi - - { role: fedmsg/base, - when: deployment_type == "prod" } + - role: fedmsg/base # Set up for fedora-messaging - role: rabbit/user username: "pdc{{ env_suffix }}" diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml index 3239a4c5b1..1fd6ac0b0c 100644 --- a/playbooks/groups/resultsdb.yml +++ b/playbooks/groups/resultsdb.yml @@ -30,8 +30,7 @@ - { role: openvpn/client, when: deployment_type == "prod" } - apache - - { role: fedmsg/base, - when: deployment_type == "prod" } + - fedmsg/base - { role: dnf-automatic, tags: ['dnfautomatic'] } # Set up for fedora-messaging - { role: rabbit/user, diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index bf0aece957..c4f70c4d8f 100644 --- a/playbooks/groups/sundries.yml +++ b/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" } diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 4bdb3154c6..3fb8e793e7 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -19,8 +19,7 @@ - { role: ipa/client, when: env == "staging" } - collectd/base - apache - - { role: fedmsg/base, - when: deployment_type == "prod" } + - fedmsg/base # Set up for fedora-messaging - { role: rabbit/user, username: "value{{ env_suffix }}"} diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 885f6873a9..90fd18ec38 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -27,8 +27,7 @@ - { role: fas_client, when: env != "staging" } - collectd/base - apache - - { role: fedmsg/base, - when: deployment_type == "prod" } + - fedmsg/base # 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 }}"}