diff options
| author | Adam Williamson <awilliam@redhat.com> | 2017-02-14 17:12:37 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2017-02-14 17:12:37 -0800 |
| commit | a4366ff9f56b8c68467dbd4a3a612ca0322aa0df (patch) | |
| tree | 0e543b9e5d434fd946501de0520a736284ab464e | |
| parent | fff2dddf8fc851e19146e9f9967114f52300ff33 (diff) | |
| download | ansible-a4366ff9f56b8c68467dbd4a3a612ca0322aa0df.tar.gz ansible-a4366ff9f56b8c68467dbd4a3a612ca0322aa0df.tar.xz ansible-a4366ff9f56b8c68467dbd4a3a612ca0322aa0df.zip | |
check-compose: use appropriate fedmsg consumer
Don't use prod consumer on staging...
| -rw-r--r-- | roles/check-compose/files/checkcomp_consumer.py | 3 | ||||
| -rw-r--r-- | roles/check-compose/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/check-compose/templates/checkcomp_consumer.py.j2 | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/check-compose/files/checkcomp_consumer.py b/roles/check-compose/files/checkcomp_consumer.py deleted file mode 100644 index 5d3068cff..000000000 --- a/roles/check-compose/files/checkcomp_consumer.py +++ /dev/null @@ -1,3 +0,0 @@ -config = { - 'checkcomp_consumer.prod.enabled': True, -} diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml index 0d91c4833..7c8e52b8b 100644 --- a/roles/check-compose/tasks/main.yml +++ b/roles/check-compose/tasks/main.yml @@ -78,7 +78,7 @@ - restart fedmsg-hub - name: Enable fedmsg consumer - copy: src=checkcomp_consumer.py dest=/etc/fedmsg.d/checkcomp_consumer.py owner=root group=root mode=0644 + template: src=checkcomp_consumer.py.j2 dest=/etc/fedmsg.d/checkcomp_consumer.py owner=root group=root mode=0644 notify: - restart fedmsg-hub tags: diff --git a/roles/check-compose/templates/checkcomp_consumer.py.j2 b/roles/check-compose/templates/checkcomp_consumer.py.j2 new file mode 100644 index 000000000..d5af64308 --- /dev/null +++ b/roles/check-compose/templates/checkcomp_consumer.py.j2 @@ -0,0 +1,9 @@ +config = { +{% if deployment_type is defined and deployment_type == 'prod' %} + 'checkcomp_consumer.prod.enabled': True, +{% elif deployment_type is defined and deployment_type == 'stg' %} + 'checkcomp_consumer.stg.enabled': True, +{% else %} + checkcomp_consumer.test.enabled': True, +{% endif %} +} |