diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws index a851aa7476..1a80c9c022 100644 --- a/inventory/group_vars/copr_back_aws +++ b/inventory/group_vars/copr_back_aws @@ -46,8 +46,7 @@ messaging: - app_name: Copr build system key: copr username: copr - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.copr\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* nrpe_procs_crit: 2500 nrpe_procs_warn: 2200 root_auth_users: msuchy pingou frostyx praiskup diff --git a/inventory/group_vars/copr_back_dev_aws b/inventory/group_vars/copr_back_dev_aws index dfdc7ddbc5..faf8c54c4a 100644 --- a/inventory/group_vars/copr_back_dev_aws +++ b/inventory/group_vars/copr_back_dev_aws @@ -40,8 +40,7 @@ messaging: - app_name: Copr build system key: copr username: copr - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.copr\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* root_auth_users: msuchy pingou frostyx praiskup spawn_in_advance: "false" tcp_ports: [ diff --git a/inventory/group_vars/github2fedmsg b/inventory/group_vars/github2fedmsg index dc647374ac..b224fc8dd7 100644 --- a/inventory/group_vars/github2fedmsg +++ b/inventory/group_vars/github2fedmsg @@ -61,8 +61,7 @@ primary_auth_source: ipa tcp_ports: [80] # for fedora-messaging username: "github2fedmsg{{ env_suffix }}" -sent_topics: -- ^org\.fedoraproject\.{{ env_short }}\.github\..* +sent_topics: ^org\.fedoraproject\.{{ env_short }}\.github\..* # Definining these vars has a number of effects # 1) mod_wsgi is configured to use the vars for its own setup # 2) iptables opens enough ports for all threads for fedmsg diff --git a/inventory/group_vars/github2fedmsg_stg b/inventory/group_vars/github2fedmsg_stg index 084b057105..48a13c9593 100644 --- a/inventory/group_vars/github2fedmsg_stg +++ b/inventory/group_vars/github2fedmsg_stg @@ -60,8 +60,7 @@ num_cpus: 1 tcp_ports: [80] # for fedora-messaging username: "github2fedmsg{{ env_suffix }}" -sent_topics: -- ^org\.fedoraproject\.{{ env_short }}\.github\..* +sent_topics: ^org\.fedoraproject\.{{ env_short }}\.github\..* # Definining these vars has a number of effects # 1) mod_wsgi is configured to use the vars for its own setup # 2) iptables opens enough ports for all threads for fedmsg diff --git a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org index 3212889ebc..7c8d88ede9 100644 --- a/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be-dev.cloud.fedoraproject.org @@ -21,8 +21,7 @@ messaging: - app_name: Copr build system key: copr username: copr - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.copr\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* # There is no python2 on F30 nagios_Check_Services: dhcpd: false diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 9113019ff6..14577de076 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -21,8 +21,7 @@ messaging: - app_name: Copr build system key: copr username: copr - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.copr\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* nagios_Check_Services: dhcpd: false httpd: false diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index 6706b9f4a5..19a8e00e8e 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -31,11 +31,7 @@ SSLCertificateChainFile: "{{wildcard_int_file}}" - role: rabbit/user username: "batcave{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.ansible\..* - - ^org\.fedoraproject\.{{ env_short }}\.git\..* - - ^org\.fedoraproject\.{{ env_short }}\.infragit\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(ansible|git|infragit|logger\.log)\..* - role: rabbit/queue username: "mirror_pagure_ansible{{ env_suffix }}" queue_name: "mirror_pagure_ansible{{ env_suffix }}" @@ -44,8 +40,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^$ + sent_topics: ^$ - role: rabbit/queue username: "mirror_pagure_ansible{{ env_suffix }}" queue_name: "mirror_pagure_ansible{{ env_suffix }}_13" @@ -54,8 +49,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^$ + sent_topics: ^$ when: datacenter != 'iad2' - batcave - role: grobisplitter diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index f19a550576..d82e5d660b 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -99,8 +99,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.bodhi\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.bodhi\..* - role: rabbit/queue username: "bodhi{{ env_suffix }}" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index bfa243cb32..34bf19b899 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -118,8 +118,7 @@ - sudo - role: rabbit/user username: "koji{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.buildsys\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.buildsys\..* tasks: - import_tasks: "{{ tasks_path }}/motd.yml" diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index dd1de021d4..4cdb686f46 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -31,8 +31,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "logging{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.logging\.stats\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.logging\.stats\..* - logging pre_tasks: diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 6efc749dfb..059e2cfe11 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -101,8 +101,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "mailman{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.mailman\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.mailman\..* tasks: - name: install more needed packages diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 5acaebf189..ce4b8a03e1 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -104,9 +104,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "mirrormanager{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.mirrormanager\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(mirrormanager|logger\.log)\..* handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index d7213db757..3a1279940e 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -38,9 +38,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "notifs-backend{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fmn\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger\.log)\..* - sudo tasks: diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index b770767671..d0aa20dea4 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -29,9 +29,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "notifs-web{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fmn\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(fmn|logger\.log)\..* - notifs/frontend - sudo diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index 1ec2585880..2884777dbb 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -44,8 +44,7 @@ roles: - role: rabbit/user username: "odcs{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.odcs\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.odcs\..* - mod_wsgi - role: nfs/client mnt_dir: '/mnt/fedora_koji' @@ -153,8 +152,7 @@ thresholds: warning: 100 critical: 1000 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.odcs\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.odcs\..* - role: fmc handlers: diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 1df2c62afe..0c60499eb6 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -47,8 +47,6 @@ # Set up for fedora-messaging - role: rabbit/user username: "pdc{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.pdc\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pdc|logger\.log)\..* when: inventory_hostname.startswith(('pdc-web01','pdc-web01.stg')) - pdc/frontend diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index b837fc4f96..300b8610e9 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -75,9 +75,7 @@ - git/server - role: rabbit/user username: "planet{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.planet\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(planet|logger\.log)\..* - role: apache diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 2156421592..7f00b4b6ae 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -82,10 +82,7 @@ # Set up for fedora-messaging - role: rabbit/user username: "pagure{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.pagure\..* - - ^org\.fedoraproject\.{{ env_short }}\.git\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pagure|git|logger\.log)\..* handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 23cfa83e89..9f650eb4af 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -130,10 +130,7 @@ - role: rabbit/user username: "pungi{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* - - ^org\.fedoraproject\.{{ env_short }}\.pungi\..* - - ^org\.fedoraproject\.{{ env_short }}\.compose\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(pungi|compose|logger\.log)\..* - { role: "push-container-registry", diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index b3ef738e47..9bd6c8e1b8 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -46,8 +46,7 @@ - "org.fedoraproject.*.faf.problem.threshold10000" - "org.fedoraproject.*.faf.problem.threshold100000" - "org.fedoraproject.*.faf.problem.threshold1000000" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.faf\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.faf\..* - name: Setup retrace hosts hosts: retrace,retrace_stg diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 9b601897a5..df581959d0 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -57,8 +57,7 @@ when: master_sundries_node|bool - role: rabbit/user username: "sundries{{ env_suffix }}" - sent_topics: - - ^$ + sent_topics: ^$ when: master_sundries_node|bool and deployment_type == "stg" - role: fedmsg/base when: master_sundries_node|bool diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 0ca1ec83eb..b6ea016323 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -33,9 +33,7 @@ - role: rabbit/queue username: "wiki{{ env_suffix }}" queue_name: "wiki{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.wiki\..* - - ^org\.fedoraproject\.{{ env_short }}\.logger\.log\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(wiki|logger\.log)\..* when: inventory_hostname.startswith('wiki01') - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index cbf8f85c94..edb9d9e9b7 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -67,9 +67,7 @@ - "org.fedoraproject.*.coreos.build.request.artifacts-sign" - "org.fedoraproject.*.coreos.build.request.ostree-sign" - "org.fedoraproject.*.buildsys.tag" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.coreos\..*\.finished$ - - ^org\.fedoraproject\.{{ env_short }}\.robosignatory\..*\.finished$ + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(robosignatory|coreos)\..*\.finished$ - robosignatory - role: keytab/service service: autosign diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index dc29b11f1f..b1b6452d2c 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -32,8 +32,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.bodhi\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.bodhi\..* - role: openshift/project app: bodhi diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index b8f769a67e..9705581b07 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -12,8 +12,7 @@ - role: rabbit/user username: "bugzilla2fedmsg{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.bugzilla\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.bugzilla\..* - role: openshift/project app: bugzilla2fedmsg diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index e387664df2..9329a6a6cf 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -43,8 +43,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.coreos\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.coreos\..* # Fedora Messaging secrets - role: openshift/secret-file diff --git a/playbooks/openshift-apps/datanommer.yml b/playbooks/openshift-apps/datanommer.yml index b1bfb4e6a8..98d4c28f95 100644 --- a/playbooks/openshift-apps/datanommer.yml +++ b/playbooks/openshift-apps/datanommer.yml @@ -18,8 +18,7 @@ warning: 50 critical: 500 # Datanommer does not publish messages - sent_topics: - - "^$" + sent_topics: ^$ - role: openshift/project app: datanommer diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index d58240d9ae..62c51b3864 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -11,8 +11,7 @@ roles: - role: rabbit/user username: "discourse2fedmsg{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.discourse\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.discourse\..* - role: openshift/project app: discourse2fedmsg diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index cfdd7bb281..7f1ea5b1a6 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -33,8 +33,7 @@ roles: - role: rabbit/user username: "elections{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fedora_elections\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fedora_elections\..* - role: openshift/project app: elections diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index f870bbcf5e..57a55e9ba3 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -11,8 +11,7 @@ roles: - role: rabbit/user username: "fedocal{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fedocal\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fedocal\..* - role: openshift/project app: fedocal diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 45bbdbe80d..748babf99a 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -19,8 +19,7 @@ thresholds: warning: 50 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.greenwave\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.greenwave\..* # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index 8a9410e37c..ec75a7f774 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -16,9 +16,7 @@ queue_name: "{{ app }}{{ env_suffix }}" routing_keys: [] message_ttl: 60000 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.koschei\..* - - ^org\.fedoraproject\.{{ env_short }}\.ci\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(koschei|ci)\..* - openshift/project diff --git a/playbooks/openshift-apps/message-tagging-service.yml b/playbooks/openshift-apps/message-tagging-service.yml index f08fb12095..62b815cafc 100644 --- a/playbooks/openshift-apps/message-tagging-service.yml +++ b/playbooks/openshift-apps/message-tagging-service.yml @@ -45,8 +45,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.build\.tag\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.build\.tag\..* # cacert, certificate and private key for fedora-messaging diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml index cdc5ba121b..d30a5348c8 100644 --- a/playbooks/openshift-apps/monitor_gating.yml +++ b/playbooks/openshift-apps/monitor_gating.yml @@ -26,8 +26,7 @@ - role: rabbit/user username: "monitor-gating{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.monitor-gating\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.monitor-gating\..* - role: openshift/keytab app: monitor-gating diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index a534de61d9..618bf3b1de 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -13,8 +13,7 @@ roles: - role: rabbit/user username: "noggin{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fas\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fas\..* - role: openshift/project app: noggin-centos diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index 11c9c95e07..a0e2432f06 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -13,8 +13,7 @@ roles: - role: rabbit/user username: "noggin{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.fas\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.fas\..* - role: openshift/project app: noggin diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index 521b6d3fa7..482114f254 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -13,8 +13,7 @@ roles: - role: rabbit/user username: "anitya{{ env_suffix }}" - sent_topics: - - ^org\.release-monitoring\.{{ env_short }}\.anitya\..* + sent_topics: ^org\.release-monitoring\.{{ env_short }}\.anitya\..* - role: openshift/project app: release-monitoring description: release-monitoring diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml index 57ef03db1b..e2dde43430 100644 --- a/playbooks/openshift-apps/resultsdb-ci-listener.yml +++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml @@ -22,8 +22,7 @@ - 'org.centos.*.ci.koji-build.test.running' - 'org.centos.*.ci.koji-build.test.complete' - 'org.centos.*.ci.koji-build.test.error' - sent_topics: - - ^$ + sent_topics: ^$ # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index 21bca18bbd..d2452d7b8f 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -40,8 +40,7 @@ roles: - role: rabbit/user username: "resultsdb{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.resultsdb\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.resultsdb\..* # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index eb30082468..c7f31221f6 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -20,8 +20,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.hotness\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.hotness\..* - role: openshift/project app: the-new-hotness diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index 9f51c407e2..ca9fe32eaa 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -53,8 +53,7 @@ thresholds: warning: 10 critical: 100 - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.toddlers\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.toddlers\..* - role: openshift/keytab app: toddlers diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index aad223effa..bd6916cc7c 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -39,8 +39,7 @@ roles: - role: rabbit/user username: "waiverdb{{ env_suffix }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.waiverdb\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.waiverdb\..* # The openshift/project role breaks if the project already exists: # https://pagure.io/fedora-infrastructure/issue/6404 diff --git a/roles/rabbit/queue/defaults/main.yml b/roles/rabbit/queue/defaults/main.yml index 8528fa87a2..7b85ab076c 100644 --- a/roles/rabbit/queue/defaults/main.yml +++ b/roles/rabbit/queue/defaults/main.yml @@ -7,4 +7,4 @@ thresholds: warning: 10000 critical: 100000 nagios_server: noc01.iad2.fedoraproject.org -sent_topics: [] +sent_topics: null diff --git a/roles/rabbit/queue/tasks/main.yml b/roles/rabbit/queue/tasks/main.yml index 941e3d08ff..68df5b3761 100644 --- a/roles/rabbit/queue/tasks/main.yml +++ b/roles/rabbit/queue/tasks/main.yml @@ -43,12 +43,14 @@ - name: Prepare the topic permissions dict set_fact: - topic_permissions: "{{ topic_permissions|default([]) + [{'vhost': vhost, 'read_priv': '.*', 'write_priv': item}] }}" - loop: "{{ sent_topics }}" + topic_permissions: + - vhost: vhost + read_priv: .* + write_priv: sent_topics tags: - fedora-messaging - rabbitmq_cluster - when: env == "staging" + when: env == "staging" and sent_topics - debug: msg: "Topic permissions: {{ topic_permissions|default([]) }}" diff --git a/roles/rabbit/user/defaults/main.yml b/roles/rabbit/user/defaults/main.yml index 6fed45064d..23f125e072 100644 --- a/roles/rabbit/user/defaults/main.yml +++ b/roles/rabbit/user/defaults/main.yml @@ -1,3 +1,3 @@ rabbitmq_server: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" vhost: /pubsub -sent_topics: [] +sent_topics: null diff --git a/roles/rabbit/user/tasks/main.yml b/roles/rabbit/user/tasks/main.yml index e9890aca1a..77ad4bfa72 100644 --- a/roles/rabbit/user/tasks/main.yml +++ b/roles/rabbit/user/tasks/main.yml @@ -26,13 +26,15 @@ - name: Prepare the topic permissions dict set_fact: - topic_permissions: "{{ topic_permissions|default([]) + [{'vhost': vhost, 'read_priv': '.*', 'write_priv': item}] }}" - loop: "{{ sent_topics }}" + topic_permissions: + - vhost: vhost + read_priv: .* + write_priv: sent_topics tags: - config - fedora-messaging - rabbitmq_cluster - when: env == "staging" + when: env == "staging" and sent_topics - debug: msg: "Topic permissions: {{ topic_permissions|default([]) }}" diff --git a/roles/rabbitmq_cluster/tasks/apps.yml b/roles/rabbitmq_cluster/tasks/apps.yml index 0a0689c85c..514cb23c9a 100644 --- a/roles/rabbitmq_cluster/tasks/apps.yml +++ b/roles/rabbitmq_cluster/tasks/apps.yml @@ -70,8 +70,7 @@ name: rabbit/user vars: username: copr{{ env_suffix }} - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.copr\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.copr\..* - name: CentOS Stream run_once: true diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index 85ba60ac3c..852ada346c 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -104,8 +104,7 @@ name: rabbit/user vars: username: "{{ botnames[env] }}" - sent_topics: - - ^org\.fedoraproject\.{{ env_short }}\.meetbot\..* + sent_topics: ^org\.fedoraproject\.{{ env_short }}\.meetbot\..* when: - inventory_hostname.startswith('value02')