From 66d764612bc058bdc5721263621bfbcca7a88bb5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 13 Nov 2019 16:59:42 -0800 Subject: [PATCH] relvalconsumer: add mechanism for disabling services This is because authing to the wiki on staging is broken right now, so I want a clean mechanism for turning off all services that write to the wiki. See https://pagure.io/fedora-infrastructure/issue/8381 Signed-off-by: Adam Williamson --- inventory/group_vars/relvalconsumer_test | 6 ++++++ roles/relvalconsumer/defaults/main.yml | 2 ++ roles/relvalconsumer/tasks/main.yml | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/inventory/group_vars/relvalconsumer_test b/inventory/group_vars/relvalconsumer_test index fe92a33f08..067d938fba 100644 --- a/inventory/group_vars/relvalconsumer_test +++ b/inventory/group_vars/relvalconsumer_test @@ -1,2 +1,8 @@ relvalconsumer_prod: false relvalconsumer_env_suffix: .test + +# FIXME: disable consumers that write to wiki until auth key +# is working again: +# https://pagure.io/fedora-infrastructure/issue/8381 +relvalconsumer_disabled: true +relvalamiconsumer_disabled: true diff --git a/roles/relvalconsumer/defaults/main.yml b/roles/relvalconsumer/defaults/main.yml index de0d5d59b9..d61ef1fd9b 100644 --- a/roles/relvalconsumer/defaults/main.yml +++ b/roles/relvalconsumer/defaults/main.yml @@ -7,4 +7,6 @@ relvalconsumer_amqp_cert: /etc/fedora-messaging/fedora-cert.pem relvalconsumer_amqp_routing_keys: ["org.fedoraproject.prod.pungi.compose.status.change"] relvalconsumer_amqp_mailfrom: "root@{{ external_hostname }}" relvalconsumer_amqp_smtp: localhost +relvalconsumer_disabled: false relvalamiconsumer_amqp_routing_keys: ["org.fedoraproject.prod.fedimg.image.publish"] +relvalamiconsumer_disabled: false diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml index 62b168744f..43eeb52a7d 100644 --- a/roles/relvalconsumer/tasks/main.yml +++ b/roles/relvalconsumer/tasks/main.yml @@ -69,11 +69,19 @@ ## string - Hostname of SMTP server to use for sending error ## emails. Defaults to 'localhost'. Only relevant if ## relvalconsumer_amqp_mailto is set. +# - relvalconsumer_disabled +## bool - If true, don't enable the consumer service. This is +## mainly just for temporary use if something's broken. +## default - False # - relvalamiconsumer_amqp_routing_keys ## list - List of routing key names for the event AMI page ## updater to subscribe to. The role default for this ## is the appropriate keys for the Fedora production ## broker. +# - relvalamiconsumer_disabled +## bool - If true, don't enable the consumer service. This is +## mainly just for temporary use if something's broken. +## default - False # # Optional vars # - relvalconsumer_amqp_mailto @@ -221,6 +229,8 @@ - name: Enable and start fedora-messaging relvalconsumer service: name=fm-consumer@relvalconsumer enabled=yes state=started + when: not relvalconsumer_disabled|bool - name: Enable and start fedora-messaging relvalamiconsumer service: name=fm-consumer@relvalamiconsumer enabled=yes state=started + when: not relvalamiconsumer_disabled|bool