From ff39c9ae12da431f2e8baff2c951e160358b28b9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 18 Feb 2020 16:22:14 -0500 Subject: [PATCH] openshift-apps/coreos-ostree-importer: remove org.fedoraproject.{stg,prod} from topics This isn't used anymore and according to jcline shouldn't be used for new things. --- playbooks/openshift-apps/coreos-ostree-importer.yml | 9 +++++++-- .../templates/fedora-messaging.toml | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index 0a99097656..69f6ab9ba7 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -11,11 +11,16 @@ vars: - fedora_messaging_username: "coreos-ostree-importer{{ env_suffix }}" - fedora_messaging_queue_name: "coreos-ostree-importer{{ env_suffix }}" - - fedora_messaging_routing_keys: - - "org.fedoraproject.*.coreos.build.request.ostree-import" - fedora_messaging_ca_file: "coreos-ostree-importer-fedora-messaging-cacert.pem" - fedora_messaging_cert_file: "coreos-ostree-importer-fedora-messaging-cert.pem" - fedora_messaging_key_file: "coreos-ostree-importer-fedora-messaging-key.pem" +{% if env == "staging" %} + - fedora_messaging_routing_keys: + - "org.fedoraproject.stg.coreos.build.request.ostree-import" +{% else %} + - fedora_messaging_routing_keys: + - "org.fedoraproject.prod.coreos.build.request.ostree-import" +{% endif %} roles: - role: openshift/project diff --git a/roles/openshift-apps/coreos-ostree-importer/templates/fedora-messaging.toml b/roles/openshift-apps/coreos-ostree-importer/templates/fedora-messaging.toml index 18d613ed5b..3fe46e2ee8 100644 --- a/roles/openshift-apps/coreos-ostree-importer/templates/fedora-messaging.toml +++ b/roles/openshift-apps/coreos-ostree-importer/templates/fedora-messaging.toml @@ -9,14 +9,6 @@ callback = "fedora_messaging.example:printer" # and configured correctly. passive_declares = true -# The topic_prefix configuration value will add a prefix to the topics of every sent message. -# This is used for migrating from fedmsg, and should not be used afterwards. -{% if env == "staging" %} -topic_prefix = "org.fedoraproject.stg" -{% else %} -topic_prefix = "org.fedoraproject.prod" -{% endif %} - [tls] ca_cert = "/etc/pki/fedora-messaging/{{ fedora_messaging_ca_file }}" keyfile = "/etc/pki/fedora-messaging/{{ fedora_messaging_key_file }}"