diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg index 7ef65a482c..ab728197d2 100644 --- a/inventory/group_vars/bodhi-backend-stg +++ b/inventory/group_vars/bodhi-backend-stg @@ -41,6 +41,7 @@ fedmsg_error_recipients: # They are both true for the single bodhi-backend node in stg. bodhi_masher_enabled: True bodhi_updates_handler_enabled: True +bodhi_signed_handler_enabled: True # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2 index 66471f2127..b7b5daa8b0 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/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2-stg index 5d0be62f12..b8c556bacd 100644 --- a/inventory/group_vars/bodhi2-stg +++ b/inventory/group_vars/bodhi2-stg @@ -39,6 +39,7 @@ datacenter: staging # 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.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org index 1efe932444..1f8676299e 100644 --- a/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.phx2.fedoraproject.org @@ -13,6 +13,7 @@ mem_size: 65536 # 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 # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org index d40a3f8897..1cf03fbb34 100644 --- a/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend02.phx2.fedoraproject.org @@ -12,6 +12,7 @@ vmhost: bvirthost06.phx2.fedoraproject.org # These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/ bodhi_masher_enabled: False bodhi_updates_handler_enabled: True +bodhi_signed_handler_enabled: True # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/bodhi-backend03.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend03.phx2.fedoraproject.org index 31fb253911..64785629ea 100644 --- a/inventory/host_vars/bodhi-backend03.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend03.phx2.fedoraproject.org @@ -15,6 +15,7 @@ num_cpus: 16 # 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 # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml index be8f7c94d9..2e2a94aa59 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: diff --git a/roles/bodhi2/base/templates/signed_handler.py b/roles/bodhi2/base/templates/signed_handler.py new file mode 100644 index 0000000000..27b9bedfa5 --- /dev/null +++ b/roles/bodhi2/base/templates/signed_handler.py @@ -0,0 +1,3 @@ +config = dict( + signed_handler={{bodhi_signed_handler_enabled}}, +)