From c45d971196e324e2ef539615fabd894123ccdb8d Mon Sep 17 00:00:00 2001 From: Leonardo Rossetti Date: Fri, 10 Jun 2022 16:21:29 -0300 Subject: [PATCH] using same value for both username and queue name --- playbooks/openshift-apps/resultsdb-ci-listener.yml | 6 +++--- .../resultsdb-ci-listener/templates/configmaps.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml index a215668da6..5626778012 100644 --- a/playbooks/openshift-apps/resultsdb-ci-listener.yml +++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml @@ -10,11 +10,11 @@ roles: - role: rabbit/user - username: "resultsdb-ci-listener{{ env_suffix }}" + username: "resultsdb{{ env_suffix }}_ci_listener" - role: rabbit/queue - username: "resultsdb-ci-listener{{ env_suffix }}" - queue_name: resultsdb{{ env_suffix }}_ci_listener + username: "resultsdb{{ env_suffix }}_ci_listener" + queue_name: "resultsdb{{ env_suffix }}_ci_listener" # TTL: 10 days (in miliseconds) message_ttl: 864000000 routing_keys: diff --git a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml index 3f80ac5477..942f2526b8 100644 --- a/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml +++ b/roles/openshift-apps/resultsdb-ci-listener/templates/configmaps.yml @@ -10,7 +10,7 @@ data: # For complete details on all configuration options, see the documentation # https://fedora-messaging.readthedocs.io/en/latest/configuration.html. - amqp_url = "amqps://resultsdb-ci-listener{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" + amqp_url = "amqps://resultsdb{{ env_suffix }}_ci_listener:@rabbitmq{{ env_suffix }}.fedoraproject.org/%2Fpubsub" {% if env == "staging" %} topic_prefix = "org.fedoraproject.stg"