[ansible] Update bodhi base

commit d9a79544fe11466a5bb39d3c9f057b6e3771f22f Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Nov 10 09:09:42 2016 +0100 Update bodhi base inventory/group_vars/bodhi2 | 1 + .../host_vars/bodhi-backend01.online.rpmfusion.net | 4 ++-- roles/bodhi2/base/tasks/main.yml | 9 +++++---- roles/bodhi2/base/templates/signed_handler.py | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) --- diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2 index 18d32dd..a0a4cd9 100644 --- a/inventory/group_vars/bodhi2 +++ b/inventory/group_vars/bodhi2 @@ -35,6 +35,7 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers" # frontend nodes won't run either of these bodhi_masher_enabled: False bodhi_updates_handler_enabled: False +bodhi_signed_handler_enabled: False # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/bodhi-backend01.online.rpmfusion.net b/inventory/host_vars/bodhi-backend01.online.rpmfusion.net index 6c6892b..18543d5 100644 --- a/inventory/host_vars/bodhi-backend01.online.rpmfusion.net +++ b/inventory/host_vars/bodhi-backend01.online.rpmfusion.net @@ -12,8 +12,8 @@ nrpe_procs_crit: 1000 # These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/ bodhi_masher_enabled: True -bodhi_updates_handler_enabled: False -bodhi_signed_handler_enabled: False +bodhi_updates_handler_enabled: True +bodhi_signed_handler_enabled: True wsgi_procs: 2 wsgi_threads: 15 diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index 06c8303..06c7c60 100644 --- a/roles/bodhi2/base/tasks/main.yml +++ b/roles/bodhi2/base/tasks/main.yml @@ -59,6 +59,7 @@ - bodhi.py - masher.py - updates_handler.py + - signed_handler.py notify: - restart fedmsg-hub tags: @@ -99,14 +100,14 @@ - name: install bodhi certificates copy: > - src="{{ private }}/files/rpmfusion-ca.cert" + src="{{ private }}/files/{{ item }}" dest="/etc/pki/bodhi/{{ item }}" owner=root group=root mode=0644 with_items: - - fedora-server-ca.cert - - fedora-upload-ca.cert + - rpmfusion-server-ca.cert + - rpmfusion-upload-ca.cert tags: - config - bodhi @@ -127,7 +128,7 @@ #- name: check the selinux context of the bugzilla cookie # command: matchpathcon /var/tmp/bodhi-bz.cookie # register: cookiecontext -# always_run: yes +# check_mode: no # changed_when: "1 != 1" # tags: # - config diff --git a/roles/bodhi2/base/templates/signed_handler.py b/roles/bodhi2/base/templates/signed_handler.py new file mode 100644 index 0000000..27b9bed --- /dev/null +++ b/roles/bodhi2/base/templates/signed_handler.py @@ -0,0 +1,3 @@ +config = dict( + signed_handler={{bodhi_signed_handler_enabled}}, +)