diff --git a/inventory/group_vars/copr_back b/inventory/group_vars/copr_back index 5bbd592e86..b1f52a4e30 100644 --- a/inventory/group_vars/copr_back +++ b/inventory/group_vars/copr_back @@ -20,8 +20,6 @@ copr_builder_images: nrpe_procs_warn: 2200 nrpe_procs_crit: 2500 -fedmsg_enabled: "true" - do_sign: "true" spawn_in_advance: "true" diff --git a/inventory/group_vars/copr_back_dev b/inventory/group_vars/copr_back_dev index 5ba2146244..de94b2a9c1 100644 --- a/inventory/group_vars/copr_back_dev +++ b/inventory/group_vars/copr_back_dev @@ -17,8 +17,6 @@ copr_builder_images: ppc64le: copr-builder-ppc64le-f30-20190814_133103 aarch64: copr-builder-20190814_133304 -fedmsg_enabled: "true" - do_sign: "true" spawn_in_advance: "false" diff --git a/inventory/group_vars/copr_back_stg b/inventory/group_vars/copr_back_stg index 5861b26fa0..58ac5450cb 100644 --- a/inventory/group_vars/copr_back_stg +++ b/inventory/group_vars/copr_back_stg @@ -14,8 +14,6 @@ copr_builder_network_name: "coprdev-net" copr_builder_key_name: "buildsys" copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev" -fedmsg_enabled: "true" - do_sign: "true" spawn_in_advance: "false" diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index fd0289540a..259459ce98 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -22,22 +22,14 @@ tcp_ports: [ 22, 80, 443, # These 8 ports are used by fedmsg. One for each wsgi thread. 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007] -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: root -- service: copr - owner: root - group: copr - can_send: - - copr.build.start - - copr.build.end - - copr.chroot.start - - copr.worker.create +# consumed by roles/messaging/base +messaging: + certificates: + - key: copr + username: copr + app_name: Copr build system # Copr vars - copr_hostbase: copr-be host_backup_targets: ['/var/lib/copr/public_html/results'] diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 7787013b43..4276474ef8 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -220,7 +220,6 @@ - restart copr-backend tags: - config - when: devel|bool - name: copy sign.conf template: src=sign.conf dest=/etc/sign.conf owner=root group=copr mode=640 diff --git a/roles/copr/backend/templates/copr-be.conf.j2 b/roles/copr/backend/templates/copr-be.conf.j2 index 40c69507da..7ef04db2ea 100644 --- a/roles/copr/backend/templates/copr-be.conf.j2 +++ b/roles/copr/backend/templates/copr-be.conf.j2 @@ -98,10 +98,6 @@ worker_logdir=/var/log/copr/workers/ # default is false #exit_on_worker=false -# publish fedmsg notifications from workers if true -# default is false -fedmsg_enabled={{ fedmsg_enabled }} - # enable package signing, require configured # signer host and correct /etc/sign.conf do_sign={{ do_sign }}