diff --git a/roles/openqa/dispatcher/files/openqa_consumer.py b/roles/openqa/dispatcher/files/openqa_consumer.py deleted file mode 100644 index 80bb6160c7..0000000000 --- a/roles/openqa/dispatcher/files/openqa_consumer.py +++ /dev/null @@ -1,3 +0,0 @@ -config = { - 'fedora_openqa_schedule.consumer.enabled': True, -} diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index ac569b5992..c0642c1921 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -106,7 +106,7 @@ - config - name: Enable fedmsg consumer - copy: src=openqa_consumer.py dest=/etc/fedmsg.d/openqa_consumer.py owner=root group=root mode=0644 + template: src=openqa_consumer.py.j2 dest=/etc/fedmsg.d/openqa_consumer.py owner=root group=root mode=0644 notify: - restart fedmsg-hub tags: diff --git a/roles/openqa/dispatcher/templates/openqa_consumer.py.j2 b/roles/openqa/dispatcher/templates/openqa_consumer.py.j2 new file mode 100644 index 0000000000..ccb6eb19e7 --- /dev/null +++ b/roles/openqa/dispatcher/templates/openqa_consumer.py.j2 @@ -0,0 +1,10 @@ +config = { + 'fedora_openqa_schedule.consumer.enabled': True, +{% if wikitcms_user is defined and wikitcms_password is defined %} + {% if deployment_type == 'stg' %} + 'fedora_openqa_schedule.wiki.consumer.stg.enabled': True, + {% else %} + 'fedora_openqa_schedule.wiki.consumer.prod.enabled': True, + {% endif %} +{% endif %} +}