summaryrefslogtreecommitdiffstats
path: root/roles/relvalconsumer
diff options
context:
space:
mode:
authorAdam Williamson <awilliam@redhat.com>2016-11-30 13:33:31 -0800
committerAdam Williamson <awilliam@redhat.com>2016-11-30 13:33:31 -0800
commit02434566f0c6f3f3adb0138ccd4aff5131cbf183 (patch)
tree677c87d59205e9a03ac7e14dd6029f9234fca9e1 /roles/relvalconsumer
parent12c7b64aa0f25d4144e071c93912a41437058a78 (diff)
downloadansible-02434566f0c6f3f3adb0138ccd4aff5131cbf183.tar.gz
ansible-02434566f0c6f3f3adb0138ccd4aff5131cbf183.tar.xz
ansible-02434566f0c6f3f3adb0138ccd4aff5131cbf183.zip
relvalconsumer: handle wikitcms being disabled
Diffstat (limited to 'roles/relvalconsumer')
-rw-r--r--roles/relvalconsumer/tasks/main.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index 7ae4f1d6b..bc068047e 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -38,8 +38,14 @@
- name: Create /etc/fedora (credentials files location)
file: path=/etc/fedora state=directory owner=root group=fedmsg mode=0750
+# We actually want to handle the case where wikitcms_user isn't defined
+# even though it makes this role essentially do nothing, as we don't
+# really want openqa-stg creating stuff in the staging wiki all the
+# time. So in that case install the role but don't set up a credentials
+# file and leave the role disabled
- name: Write wikitcms credentials file
template: src=credentials.j2 dest=/etc/fedora/credentials owner=root group=fedmsg mode=0640
+ when: "wikitcms_user is defined and wikitcms_password is defined"
tags:
- config
@@ -59,6 +65,7 @@
- name: Enable fedmsg consumer
template: src=relvalconsumer.py.j2 dest=/etc/fedmsg.d/relvalconsumer.py owner=root group=root mode=0644
+ when: "wikitcms_user is defined and wikitcms_password is defined"
notify:
- restart fedmsg-hub
tags: