Hi all, I ll be deleting the bugyou role and config from our ansible repository since it is currently not used. See the patch file attached. Please let me know, if for any reason we should keep this role. Thanks Clément. inventory/group_vars/bugyou | 25 ------------- inventory/group_vars/bugyou-stg | 25 ------------- inventory/inventory | 8 ---- master.yml | 1 - roles/bugyou/bugyou-master/tasks/main.yml | 30 --------------- .../bugyou/bugyou-master/templates/bugyou.py | 15 -------- roles/bugyou/bugyou-plugins/tasks/main.yml | 37 ------------------- .../templates/bugyou_plugins.cfg | 3 -- .../templates/bugyou_services.cfg | 8 ---- roles/epylog/files/merged/weed_local.cf | 1 - roles/nagios_client/tasks/main.yml | 12 ------ .../check_fedmsg_hub_procs_bugyou.cfg.j2 | 1 -
From 2226624b476c678791f4d1a07f5e264f09a7832b Mon Sep 17 00:00:00 2001 From: Clement Verna <cverna@xxxxxxxxxxxx> Date: Tue, 23 Apr 2019 12:20:30 +0200 Subject: [PATCH] bugyou: remove unused role and config Signed-off-by: Clement Verna <cverna@xxxxxxxxxxxx> --- inventory/group_vars/bugyou | 25 ------------- inventory/group_vars/bugyou-stg | 25 ------------- inventory/inventory | 8 ---- master.yml | 1 - roles/bugyou/bugyou-master/tasks/main.yml | 30 --------------- .../bugyou/bugyou-master/templates/bugyou.py | 15 -------- roles/bugyou/bugyou-plugins/tasks/main.yml | 37 ------------------- .../templates/bugyou_plugins.cfg | 3 -- .../templates/bugyou_services.cfg | 8 ---- roles/epylog/files/merged/weed_local.cf | 1 - roles/nagios_client/tasks/main.yml | 12 ------ .../check_fedmsg_hub_procs_bugyou.cfg.j2 | 1 - 12 files changed, 166 deletions(-) delete mode 100644 inventory/group_vars/bugyou delete mode 100644 inventory/group_vars/bugyou-stg delete mode 100644 roles/bugyou/bugyou-master/tasks/main.yml delete mode 100644 roles/bugyou/bugyou-master/templates/bugyou.py delete mode 100644 roles/bugyou/bugyou-plugins/tasks/main.yml delete mode 100644 roles/bugyou/bugyou-plugins/templates/bugyou_plugins.cfg delete mode 100644 roles/bugyou/bugyou-plugins/templates/bugyou_services.cfg delete mode 100644 roles/nagios_client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2 diff --git a/inventory/group_vars/bugyou b/inventory/group_vars/bugyou deleted file mode 100644 index 7d99eb5c6..000000000 --- a/inventory/group_vars/bugyou +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 1024 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [] - -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-fedimg,sysadmin-datanommer,sysadmin-veteran -sudoers: "{{ private }}/files/sudo/bugyou-sudoers" - -# For the MOTD -csi_security_category: Moderate -csi_primary_contact: Fedora admins - admin@xxxxxxxxxxxxxxxxx -csi_purpose: Run the 'bugyou' fedmsg process that files automatic bugs in pagure -csi_relationship: | - This node runs 'bugyou', a fedmsg consumer that files pagure bugs in - response to fedmsg bus activity. - - It is primarily used to file bugs when automatic releng processes fail. - - See https://pagure.io/bugyou for more information. diff --git a/inventory/group_vars/bugyou-stg b/inventory/group_vars/bugyou-stg deleted file mode 100644 index 1acd84018..000000000 --- a/inventory/group_vars/bugyou-stg +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Define resources for this group of hosts here. -lvm_size: 20000 -mem_size: 1024 -num_cpus: 1 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -tcp_ports: [] - -fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-fedimg,sysadmin-datanommer,sysadmin-veteran -sudoers: "{{ private }}/files/sudo/bugyou-stg-sudoers" - -# For the MOTD -csi_security_category: Moderate -csi_primary_contact: Fedora admins - admin@xxxxxxxxxxxxxxxxx -csi_purpose: Run the 'bugyou' fedmsg process that files automatic bugs in pagure -csi_relationship: | - This node runs 'bugyou', a fedmsg consumer that files pagure bugs in - response to fedmsg bus activity. - - It is primarily used to file bugs when automatic releng processes fail. - - See https://pagure.io/bugyou for more information. diff --git a/inventory/inventory b/inventory/inventory index bdd2602cd..9cad3b146 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -108,12 +108,6 @@ blockerbugs02.phx2.fedoraproject.org [blockerbugs-stg] blockerbugs01.stg.phx2.fedoraproject.org -[bugyou] -bugyou01.phx2.fedoraproject.org - -[bugyou-stg] -bugyou01.stg.phx2.fedoraproject.org - [bugzilla2fedmsg] bugzilla2fedmsg01.phx2.fedoraproject.org @@ -958,7 +952,6 @@ openqa-stg01.qa.fedoraproject.org autocloud-backend badges-backend busgateway -bugyou fedimg freshmaker-backend hotness @@ -971,7 +964,6 @@ pkgs autocloud-backend-stg badges-backend-stg busgateway-stg -bugyou-stg fedimg-stg freshmaker-backend-stg hotness-stg diff --git a/master.yml b/master.yml index 0353da09a..c8ff6904e 100644 --- a/master.yml +++ b/master.yml @@ -28,7 +28,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml diff --git a/roles/bugyou/bugyou-master/tasks/main.yml b/roles/bugyou/bugyou-master/tasks/main.yml deleted file mode 100644 index 59ed4f5e8..000000000 --- a/roles/bugyou/bugyou-master/tasks/main.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# Configuration for Bugyou - -- name: install needed packages for bugyou - package: name={{ item }} state=present enablerepo=epel-testing - with_items: - - bugyou - notify: - - restart fedmsg-hub - tags: - - bugyou - - bugyou/master - -- name: copy bugyou fedmsg configuration - template: > - src={{ item }} dest=/etc/fedmsg.d/{{ item }} - owner=root group=fedmsg mode=0640 - with_items: - - bugyou.py - notify: - - restart fedmsg-hub - tags: - - bugyou - - bugyou/master - -# This is shipped in the package but leaks stg and prod -- name: Clear out endpoints-bugyou.py - copy: - dest: /etc/fedmsg.d/endpoints-bugyou.py - content: 'config = {}' diff --git a/roles/bugyou/bugyou-master/templates/bugyou.py b/roles/bugyou/bugyou-master/templates/bugyou.py deleted file mode 100644 index 3952d3fae..000000000 --- a/roles/bugyou/bugyou-master/templates/bugyou.py +++ /dev/null @@ -1,15 +0,0 @@ -config = { - # Consumer stuff - "bugyou.consumer.enabled": True, - - # Turn on the logging for bugyou - "logging": dict( - loggers=dict( - bugyou={ - "level": "DEBUG", - "propagate": False, - "handlers": ['console'], - }, - ), - ), -} diff --git a/roles/bugyou/bugyou-plugins/tasks/main.yml b/roles/bugyou/bugyou-plugins/tasks/main.yml deleted file mode 100644 index cc19c899d..000000000 --- a/roles/bugyou/bugyou-plugins/tasks/main.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -# Configuration for Bugyou Plugins - -- name: install needed packages for bugyou_plugins - package: name={{ item }} state=present enablerepo=epel-testing - with_items: - - python-libpagure - - bugyou_plugins - - redis - notify: - - restart fedmsg-hub - tags: - - bugyou - - bugyou/plugins - -- name: copy bugyou plugins configuration files - template: > - src={{ item }} - dest=/etc/bugyou/{{ item }} - owner=root - group=fedmsg - mode=0640 - with_items: - - bugyou_plugins.cfg - - bugyou_services.cfg - notify: - - restart fedmsg-hub - tags: - - bugyou - - bugyou/plugins - -- name: start the bugyou-cntrl - service: name=bugyou-cntrl state=started - tags: - - bugyou - - bugyou/plugins - when: env == "production" diff --git a/roles/bugyou/bugyou-plugins/templates/bugyou_plugins.cfg b/roles/bugyou/bugyou-plugins/templates/bugyou_plugins.cfg deleted file mode 100644 index 8f6bc1c23..000000000 --- a/roles/bugyou/bugyou-plugins/templates/bugyou_plugins.cfg +++ /dev/null @@ -1,3 +0,0 @@ -[autocloud] -services = pagure -topic = org.fedoraproject.prod.autocloud.image.success, org.fedoraproject.prod.autocloud.image.failed diff --git a/roles/bugyou/bugyou-plugins/templates/bugyou_services.cfg b/roles/bugyou/bugyou-plugins/templates/bugyou_services.cfg deleted file mode 100644 index bbb1e6e01..000000000 --- a/roles/bugyou/bugyou-plugins/templates/bugyou_services.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[autocloud_pagure] -{% if env == 'staging' %} -repo_name = atomic-images-test -access_token = {{bugyou_stg_pagure_atomic_images_api_key}} -{% else %} -repo_name = atomic-images -access_token = {{bugyou_pagure_atomic_images_api_key}} -{% endif %} diff --git a/roles/epylog/files/merged/weed_local.cf b/roles/epylog/files/merged/weed_local.cf index 8fc85cc06..9c944f379 100644 --- a/roles/epylog/files/merged/weed_local.cf +++ b/roles/epylog/files/merged/weed_local.cf @@ -12,7 +12,6 @@ auditd.* autocloud_job.* avahi-daemon.* btseed.* -bugyou-cntrl.* celery.* check_nrpe: Remote.*accepted a Version.*Packet check_nrpe: Remote.*does not support Version.*Packets diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 0259a43ca..1c690f987 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -155,18 +155,6 @@ - config - nagios_client -# -# The actual items files here end in .j2 (they are templates) -# So when adding or modifying them change the .j2 version in git. -# -- name: install nrpe bugyou fedmsg hubs check config - template: src=check_fedmsg_hub_procs_bugyou.cfg.j2 dest=/etc/nrpe.d/check_fedmsg_hub_procs_bugyou.cfg - when: inventory_hostname.startswith('bugyou01') - notify: - - restart nrpe - tags: - - nagios_client - # # The actual items files here end in .j2 (they are templates) # So when adding or modifying them change the .j2 version in git. diff --git a/roles/nagios_client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2 deleted file mode 100644 index 94678ebb3..000000000 --- a/roles/nagios_client/templates/check_fedmsg_hub_procs_bugyou.cfg.j2 +++ /dev/null @@ -1 +0,0 @@ -command[check_fedmsg_hub_procs_bugyou]={{ libdir }}/nagios/plugins/check_procs -c 3:3 -C 'fedmsg-hub' -u fedmsg -- 2.21.0
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx