sent_topics can't be a list, it has to be a single regexp

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

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

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: [

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

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

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

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

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

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

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"

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:

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

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"

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:

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
 

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:

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

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
 

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"

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",

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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([]) }}"

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

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([]) }}"

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

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