infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

wikitcms token: create directory, install for fedmsg and root

Browse source 
Previous commit didn't work as the directory doesn't exist.
Also, I think we need the file in two places, one for root
(for if an admin runs something wikitcms-ish manually while
logged in as root) and one for fedmsg (for the usual case
when the wiki is updated by fedmsg consumers). So do that.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2017-11-16 13:24:05 -08:00
parent c5450c9cfe
commit d3356663d8
2 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roles/openqa/dispatcher/tasks/main.yml
View file

@ -133,12 +133,24 @@
tags:
- config
- name: Write wikitcms token file
- name: Create /root/.openidc (token file location for manual runs as root)
file: path=/root/.openidc state=directory owner=root group=root mode=0700
- name: Create /usr/share/fedmsg/.openidc (token file location for fedmsg consumer runs)
file: path=/usr/share/fedmsg/.openidc state=directory owner=root group=fedmsg mode=0750
- name: Write wikitcms token file for root
copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600
when: "wikitcms_token is defined"
tags:
- config
- name: Write wikitcms token file for fedmsg
copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640
when: "wikitcms_token is defined"
tags:
- config
- name: Enable fedmsg consumer
template: src=openqa_consumer.py.j2 dest=/etc/fedmsg.d/openqa_consumer.py owner=root group=root mode=0644
notify:

14
roles/relvalconsumer/tasks/main.yml
View file

@ -50,12 +50,24 @@
tags:
- config
- name: Write wikitcms token file
- name: Create /root/.openidc (token file location for manual runs as root)
file: path=/root/.openidc state=directory owner=root group=root mode=0700
- name: Create /usr/share/fedmsg/.openidc (token file location for fedmsg consumer runs)
file: path=/usr/share/fedmsg/.openidc state=directory owner=root group=fedmsg mode=0750
- name: Write wikitcms token file for root
copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600
when: "wikitcms_token is defined"
tags:
- config
- name: Write wikitcms token file for fedmsg
copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640
when: "wikitcms_token is defined"
tags:
- config
- name: Check out relvalconsumer
git:
repo: https://pagure.io/fedora-qa/relvalconsumer.git