From 06f22add9801df3d03b897c80ed6d4cfa0f033df Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Tue, 5 Mar 2019 10:08:23 +0100 Subject: [PATCH] Migrate faf from fedmsg to fedora-messging Signed-off-by: Martin Kutlak --- playbooks/groups/retrace.yml | 34 ++++++++++++++++++- roles/abrt/faf/tasks/config.yml | 8 +++++ .../etc-fedora-messaging-config.toml.j2 | 17 ++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 roles/abrt/faf/templates/etc-fedora-messaging-config.toml.j2 diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 45f53efd7d..e7db4ebf48 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -1,3 +1,35 @@ +# fedora-messaging setup +- name: setup RabbitMQ + hosts: rabbitmq[0]:rabbitmq-stg[0] + user: root + gather_facts: False + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "{{private}}/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + roles: rabbit/queue + username: "faf" + queue_name: "faf" + routing_keys: + - "org.fedoraproject.*.faf.report.threshold1" + - "org.fedoraproject.*.faf.report.threshold10" + - "org.fedoraproject.*.faf.report.threshold100" + - "org.fedoraproject.*.faf.report.threshold1000" + - "org.fedoraproject.*.faf.report.threshold1000" + - "org.fedoraproject.*.faf.report.threshold10000" + - "org.fedoraproject.*.faf.report.threshold100000" + - "org.fedoraproject.*.faf.report.threshold1000000" + - "org.fedoraproject.*.faf.problem.threshold1" + - "org.fedoraproject.*.faf.problem.threshold10" + - "org.fedoraproject.*.faf.problem.threshold100" + - "org.fedoraproject.*.faf.problem.threshold1000" + - "org.fedoraproject.*.faf.problem.threshold1000" + - "org.fedoraproject.*.faf.problem.threshold10000" + - "org.fedoraproject.*.faf.problem.threshold100000" + - "org.fedoraproject.*.faf.problem.threshold1000000" + - name: Setup retrace hosts hosts: retrace:retrace-stg user: root @@ -15,7 +47,7 @@ - rkhunter - nagios_client - sudo - - fedmsg/base +# - fedmsg/base pre_tasks: - import_tasks: "{{ tasks_path }}/yumrepos.yml" diff --git a/roles/abrt/faf/tasks/config.yml b/roles/abrt/faf/tasks/config.yml index 8d3954d8a9..49aa38c77f 100644 --- a/roles/abrt/faf/tasks/config.yml +++ b/roles/abrt/faf/tasks/config.yml @@ -3,3 +3,11 @@ - name: provide /etc/faf/faf.conf template: src=etc-faf-faf.conf.j2 dest=/etc/faf/faf.conf + +# setup fedora-messaging +- name: create the config folder for fedora-messaging + file: path=/etc/fedora-messaging/ owner=root group=root mode=0755 state=directory + +- name: provide configuration for fedora-messaging + template: src=etc-fedora-messaging-config.toml.j2 + dest=/etc/fedora-messaging/config.toml diff --git a/roles/abrt/faf/templates/etc-fedora-messaging-config.toml.j2 b/roles/abrt/faf/templates/etc-fedora-messaging-config.toml.j2 new file mode 100644 index 0000000000..1585c4078c --- /dev/null +++ b/roles/abrt/faf/templates/etc-fedora-messaging-config.toml.j2 @@ -0,0 +1,17 @@ +#{{ ansible_managed }} + +# A sample configuration for fedora-messaging. This file is in the TOML format. +# For complete details on all configuration options, see the documentation. + +amqp_url = "amqps://faf:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub" + +# 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 %} + +[client_properties] +app = "FAF"