Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

resultsdb-ci-listener: normalize on _ as we were already using that in more places

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-06-30 15:27:24 -07:00
parent ad87e20f9f
commit 2a1934972e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
playbooks/openshift-apps/resultsdb-ci-listener.yml
View file

@ -41,13 +41,13 @@
app: resultsdb-ci-listener app: resultsdb-ci-listener
secret_name: resultsdb-ci-listener-fedora-messaging-key secret_name: resultsdb-ci-listener-fedora-messaging-key
key: resultsdb-ci-listener.key key: resultsdb-ci-listener.key
privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}-ci-listener.key" privatefile: "rabbitmq/{{env}}/pki/private/resultsdb{{env_suffix}}_ci_listener.key"
- role: openshift/secret-file - role: openshift/secret-file
app: resultsdb-ci-listener app: resultsdb-ci-listener
secret_name: resultsdb-ci-listener-fedora-messaging-crt secret_name: resultsdb-ci-listener-fedora-messaging-crt
key: resultsdb-ci-listener.crt key: resultsdb-ci-listener.crt
privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}-ci-listener.crt" privatefile: "rabbitmq/{{env}}/pki/issued/resultsdb{{env_suffix}}_ci_listener.crt"
- role: openshift/secret-file - role: openshift/secret-file
app: resultsdb-ci-listener app: resultsdb-ci-listener

2
roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml
View file

@ -10,7 +10,7 @@ data:
# For complete details on all configuration options, see the documentation # For complete details on all configuration options, see the documentation
# https://fedora-messaging.readthedocs.io/en/latest/configuration.html. # https://fedora-messaging.readthedocs.io/en/latest/configuration.html.
amqp_url = "amqps://resultsdb{{ env_suffix }}-ci-listener:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" amqp_url = "amqps://resultsdb{{ env_suffix }}_ci_listener:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub"
{% if env == "staging" %} {% if env == "staging" %}
topic_prefix = "org.fedoraproject.stg" topic_prefix = "org.fedoraproject.stg"