From 18f7398ca01009280c28d3dd7d1a3d24e0d6f5e7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 13 Jun 2019 16:07:46 -0700 Subject: [PATCH] openqa: disable private fedora-messaging auth for now well, this just isn't working and no-one's around to debug it. So turn it off for now. Will try and fix it tomorrow. Signed-off-by: Adam Williamson --- roles/openqa/dispatcher/tasks/main.yml | 4 ++-- .../fedora_openqa_resultsdb_reporter.toml.j2 | 10 +++++----- .../templates/fedora_openqa_scheduler.toml.j2 | 8 ++++---- .../templates/fedora_openqa_wiki_reporter.toml.j2 | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index 4ad2feb8bc..8893591b42 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -199,13 +199,13 @@ - name: Install fedora-messaging anon staging broker cert (because it's not in the package) copy: src=fedora.stg-cert.pem dest=/etc/fedora-messaging/fedora.stg-cert.pem owner=root group=root mode=0644 - when: "openqa_fedoramessaging|bool and deployment_type is not defined" + when: "openqa_fedoramessaging|bool" # and deployment_type is not defined" tags: - config - name: Install fedora-messaging anon staging broker key (because it's not in the package) copy: src=fedora.stg-key.pem dest=/etc/fedora-messaging/fedora.stg-key.pem owner=root group=root mode=0644 - when: "openqa_fedoramessaging|bool and deployment_type is not defined" + when: "openqa_fedoramessaging|bool" # and deployment_type is not defined" tags: - config diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2 index 903fb88020..5926f818c0 100644 --- a/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2 +++ b/roles/openqa/dispatcher/templates/fedora_openqa_resultsdb_reporter.toml.j2 @@ -3,7 +3,7 @@ # something unique before using this. # # This file is in the TOML format. -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpubsub" {% else %} amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" @@ -11,7 +11,7 @@ amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" callback = "fedora_openqa.consumer:OpenQAResultsDBReporter" [tls] -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} ca_cert = "/etc/fedora-messaging/cacert{{ openqa_env_suffix }}.pem" keyfile = "/etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-key.pem" certfile = "/etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-cert.pem" @@ -30,7 +30,7 @@ durable = true auto_delete = false arguments = {} -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} # Private queue name. [queues."openqa{{ openqa_env_suffix }}_resultsdb_reporter"] {% else %} @@ -50,13 +50,13 @@ exclusive = true arguments = {} [[bindings]] -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} queue = "openqa{{ openqa_env_suffix }}_resultsdb_reporter" {% else %} queue = "{{ openqa_resultsdb_reporter_uuid }}" {% endif %} exchange = "amq.topic" -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"] {% else %} routing_keys = ["org.fedoraproject.prod.openqa.job.done"] diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 index a1e59b7203..41e082e2c2 100644 --- a/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 +++ b/roles/openqa/dispatcher/templates/fedora_openqa_scheduler.toml.j2 @@ -7,7 +7,7 @@ # we listen to the prod broker here even for staging as we need to use # prod messages to schedule jobs in openQA staging, composes and # updates just don't show up on the staging broker. -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} amqp_url = "amqps://openqa:@rabbitmq.fedoraproject.org/%2Fpubsub" {% else %} amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" @@ -16,7 +16,7 @@ callback = "fedora_openqa.consumer:OpenQAScheduler" [tls] ca_cert = "/etc/fedora-messaging/cacert.pem" -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} keyfile = "/etc/pki/fedora-messaging/openqa-key.pem" certfile = "/etc/pki/fedora-messaging/openqa-cert.pem" {% else %} @@ -33,7 +33,7 @@ durable = true auto_delete = false arguments = {} -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} # Private queue name. [queues."openqa{{ openqa_env_suffix }}_scheduler"] {% else %} @@ -53,7 +53,7 @@ exclusive = true arguments = {} [[bindings]] -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} queue = "openqa{{ openqa_env_suffix }}_scheduler" {% else %} queue = "{{ openqa_scheduler_uuid }}" diff --git a/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2 b/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2 index 4c33c285a8..ff85bac816 100644 --- a/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2 +++ b/roles/openqa/dispatcher/templates/fedora_openqa_wiki_reporter.toml.j2 @@ -3,7 +3,7 @@ # something unique before using this. # # This file is in the TOML format. -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} amqp_url = "amqps://openqa{{ openqa_env_suffix }}:@rabbitmq{{ openqa_env_suffix }}.fedoraproject.org/%2Fpubsub" {% else %} amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" @@ -11,7 +11,7 @@ amqp_url = "amqps://fedora:@rabbitmq.fedoraproject.org/%2Fpublic_pubsub" callback = "fedora_openqa.consumer:OpenQAWikiReporter" [tls] -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} ca_cert = "/etc/fedora-messaging/cacert{{ openqa_env_suffix }}.pem" keyfile = "/etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-key.pem" certfile = "/etc/pki/fedora-messaging/openqa{{ openqa_env_suffix }}-cert.pem" @@ -30,7 +30,7 @@ durable = true auto_delete = false arguments = {} -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} # Private queue name. [queues."openqa{{ openqa_env_suffix }}_wiki_reporter"] {% else %} @@ -50,13 +50,13 @@ exclusive = true arguments = {} [[bindings]] -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} queue = "openqa{{ openqa_env_suffix }}_wiki_reporter" {% else %} queue = "{{ openqa_wiki_reporter_uuid }}" {% endif %} exchange = "amq.topic" -{% if deployment_type is defined %} +{% if deployment_type is defined and 1 == 0 %} routing_keys = ["org.fedoraproject.{{ deployment_type }}.openqa.job.done"] {% else %} routing_keys = ["org.fedoraproject.prod.openqa.job.done"] @@ -65,7 +65,7 @@ routing_keys = ["org.fedoraproject.prod.openqa.job.done"] [consumer_config] openqa_hostname = "{{ openqa_hostname }}" openqa_baseurl = "https://{{ external_hostname|default(ansible_nodename) }}" -{% if deployment_type is defined and deployment_type == 'stg' %} +{% if deployment_type is defined and 1 == 0 and deployment_type == 'stg' %} wiki_hostname = "stg.fedoraproject.org" {% else %} wiki_hostname = "fedoraproject.org"