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 <awilliam@redhat.com>
This commit is contained in:
parent
5be3d907a7
commit
18f7398ca0
4 changed files with 17 additions and 17 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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 }}"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue