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

openshift-apps/coreos-ostree-importer: remove org.fedoraproject.{stg,prod} from topics

Browse source 
This isn't used anymore and according to jcline shouldn't be used
for new things.
This commit is contained in:
Dusty Mabe 2020-02-18 16:22:14 -05:00 • committed by Pierre-Yves Chibon
parent c3c911f5e2
commit ff39c9ae12
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
playbooks/openshift-apps/coreos-ostree-importer.yml
View file

@ -11,11 +11,16 @@
vars: vars:
- fedora_messaging_username: "coreos-ostree-importer{{ env_suffix }}" - fedora_messaging_username: "coreos-ostree-importer{{ env_suffix }}"
- fedora_messaging_queue_name: "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_ca_file: "coreos-ostree-importer-fedora-messaging-cacert.pem"
- fedora_messaging_cert_file: "coreos-ostree-importer-fedora-messaging-cert.pem" - fedora_messaging_cert_file: "coreos-ostree-importer-fedora-messaging-cert.pem"
- fedora_messaging_key_file: "coreos-ostree-importer-fedora-messaging-key.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: roles:
- role: openshift/project - role: openshift/project

8
roles/openshift-apps/coreos-ostree-importer/templates/fedora-messaging.toml
View file

@ -9,14 +9,6 @@ callback = "fedora_messaging.example:printer"
# and configured correctly. # and configured correctly.
passive_declares = true 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] [tls]
ca_cert = "/etc/pki/fedora-messaging/{{ fedora_messaging_ca_file }}" ca_cert = "/etc/pki/fedora-messaging/{{ fedora_messaging_ca_file }}"
keyfile = "/etc/pki/fedora-messaging/{{ fedora_messaging_key_file }}" keyfile = "/etc/pki/fedora-messaging/{{ fedora_messaging_key_file }}"