From f91a80046b235c89fca7e49fb6353e0a0de9d9f1 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Tue, 4 Aug 2020 18:13:11 +0200 Subject: [PATCH] Wipe everything that is to do with pdc-backend from our ansible repo Signed-off-by: Pierre-Yves Chibon --- playbooks/groups/pdc.yml | 22 +--- playbooks/manual/staging-sync/pdc.yml | 22 ---- playbooks/manual/upgrade/pdc.yml | 48 -------- roles/haproxy/templates/haproxy.cfg | 4 - .../templates/check_fedmsg_consumers.cfg.j2 | 3 - .../nagios_server/templates/nrpe/nrpe.cfg.j2 | 3 - roles/pdc/backend/files/pdc-audit.cron | 3 - roles/pdc/backend/tasks/main.yml | 39 ------- roles/pdc/backend/templates/fedora.json | 14 --- roles/pdc/backend/templates/pdcupdater.py | 106 ------------------ 10 files changed, 2 insertions(+), 262 deletions(-) delete mode 100644 roles/pdc/backend/files/pdc-audit.cron delete mode 100644 roles/pdc/backend/tasks/main.yml delete mode 100644 roles/pdc/backend/templates/fedora.json delete mode 100644 roles/pdc/backend/templates/pdcupdater.py diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 85575e2028..e2e53c93d1 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -1,9 +1,9 @@ # PDC servers (both frontend and backend) -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc_web:pdc_web_stg:pdc_backend:pdc_backend_stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc_web:pdc_web_stg" - name: dole out the generic configuration - hosts: pdc_web:pdc_web_stg:pdc_backend:pdc_backend_stg + hosts: pdc_web:pdc_web_stg user: root gather_facts: True vars_files: @@ -52,21 +52,3 @@ username: "pdc{{ env_suffix }}" when: inventory_hostname.startswith(('pdc-web01','pdc-web01.stg')) - pdc/frontend - -- name: stuff just for the backend nodes - hosts: pdc_backend:pdc_backend_stg - user: root - gather_facts: True - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - roles: - - fedmsg/base - - fedmsg/hub - - pdc/backend - - role: collectd/fedmsg-service - process: fedmsg-hub diff --git a/playbooks/manual/staging-sync/pdc.yml b/playbooks/manual/staging-sync/pdc.yml index a76f518109..e613e428e8 100644 --- a/playbooks/manual/staging-sync/pdc.yml +++ b/playbooks/manual/staging-sync/pdc.yml @@ -12,17 +12,6 @@ tasks: - service: name=httpd state=stopped -- name: bring staging services down (fedmsg-hub) - hosts: pdc-backend-stg - user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - service: name=fedmsg-hub state=stopped - # Here's the meaty part in the middle - name: drop and re-create the staging db entirely hosts: db01.stg.phx2.fedoraproject.org @@ -59,14 +48,3 @@ tasks: - service: name=httpd state=started - -- name: bring staging services up (fedmsg-hub) - hosts: pdc-backend-stg - user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - service: name=fedmsg-hub state=started diff --git a/playbooks/manual/upgrade/pdc.yml b/playbooks/manual/upgrade/pdc.yml index 78d965ce82..6c716e15cb 100644 --- a/playbooks/manual/upgrade/pdc.yml +++ b/playbooks/manual/upgrade/pdc.yml @@ -1,33 +1,3 @@ -- name: verify the backend, and stop it - hosts: pdc_backend:pdc_backend_stg - user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - pre_tasks: - - name: clean all metadata - command: yum clean all - check_mode: no - - name: update PDC packages - package: - name: ["pdc-client", "pdc-updater", "libmodulemd", "python2-productmd"] - state: latest - - roles: - - pdc/backend - - post_tasks: - - name: tell nagios to shush w.r.t. the backend - nagios: action=downtime minutes=15 service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org - ignore_errors: true - - name: Stop the pdc-updater backend - service: name="fedmsg-hub" state=stopped - - name: verify the frontend, stop it, upgrade the db, and restart it hosts: pdc_web:pdc_web_stg user: root @@ -67,21 +37,3 @@ nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} delegate_to: noc01.iad2.fedoraproject.org ignore_errors: true - -- name: restart the backend - hosts: pdc_backend:pdc_backend_stg - user: root - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - - tasks: - - name: And... start the backend again - service: name="fedmsg-hub" state=started - - name: tell nagios to unshush w.r.t. the backend - nagios: action=unsilence service=host host={{ inventory_hostname_short }}{{ env_suffix }} - delegate_to: noc01.iad2.fedoraproject.org - ignore_errors: true diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index cac99c00f9..d418c764aa 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -215,10 +215,6 @@ backend openqa-backend frontend pdc-frontend bind 0.0.0.0:10045 - default_backend pdc-backend - -backend pdc-backend - balance hdr(appserver) {% if env != "staging" %} # Set session persistence with a cookie. diff --git a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 index 4160a8ab5a..cc709c26a8 100644 --- a/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 +++ b/roles/nagios_client/templates/check_fedmsg_consumers.cfg.j2 @@ -15,7 +15,6 @@ command[check_fedmsg_cp_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_fedmsg_ command[check_fedmsg_cp_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedimgConsumer MonitoringProducer command[check_fedmsg_cp_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub BugzillaTicketFiler MonitoringProducer command[check_fedmsg_cp_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub CacheInvalidator MonitoringProducer -command[check_fedmsg_cp_pdc_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub PDCUpdater MonitoringProducer command[check_fedmsg_cp_mbs_backend]={{libdir}}/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MBSProducer MonitoringProducer command[check_fedmsg_cexceptions_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 @@ -34,7 +33,6 @@ command[check_fedmsg_cexceptions_bugzilla2fedmsg]={{libdir}}/nagios/plugins/chec command[check_fedmsg_cexceptions_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedimgConsumer 1 10 command[check_fedmsg_cexceptions_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub BugzillaTicketFiler 1 10 command[check_fedmsg_cexceptions_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub CacheInvalidator 1 10 -command[check_fedmsg_cexceptions_pdc_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub PDCUpdater 1 10 command[check_fedmsg_cexceptions_mbs_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub MBSConsumer 1 10 command[check_fedmsg_cbacklog_busgateway_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub Nommer 500 1000 @@ -53,7 +51,6 @@ command[check_fedmsg_cbacklog_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_f command[check_fedmsg_cbacklog_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedimgConsumer 2000 5000 command[check_fedmsg_cbacklog_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub BugzillaTicketFiler 1000 5000 command[check_fedmsg_cbacklog_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub CacheInvalidator 30000 40000 -command[check_fedmsg_cbacklog_pdc_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub PDCUpdater 10000 20000 command[check_fedmsg_cbacklog_mbs_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub MBSConsumer 10000 20000 command[check_fedmsg_fmn_digest_last_ran]={{libdir}}/nagios/plugins/check_fedmsg_producer_last_ran.py fedmsg-hub DigestProducer 90 600 diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 index d83af0fc3b..3ac9b04bfa 100644 --- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 +++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 @@ -391,7 +391,6 @@ command[check_fedmsg_cp_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/check_fedmsg_ command[check_fedmsg_cp_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub FedimgConsumer MonitoringProducer command[check_fedmsg_cp_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub BugzillaTicketFiler MonitoringProducer command[check_fedmsg_cp_packages_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub CacheInvalidator MonitoringProducer -command[check_fedmsg_cp_pdc_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub PDCUpdater MonitoringProducer command[check_fedmsg_cp_mbs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_producers_consumers.py fedmsg-hub MBSConsumer MBSProducer MonitoringProducer command[check_fedmsg_cexceptions_busgateway_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub Nommer 1 10 @@ -405,7 +404,6 @@ command[check_fedmsg_cexceptions_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/chec command[check_fedmsg_cexceptions_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub FedimgConsumer 1 10 command[check_fedmsg_cexceptions_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub BugzillaTicketFiler 1 10 command[check_fedmsg_cexceptions_packages_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub CacheInvalidator 1 10 -command[check_fedmsg_cexceptions_pdc_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub PDCUpdater 1 10 command[check_fedmsg_cexceptions_mbs_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_exceptions.py fedmsg-hub MBSConsumer 1 10 command[check_fedmsg_cbacklog_busgateway_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub Nommer 500 1000 @@ -419,7 +417,6 @@ command[check_fedmsg_cbacklog_bugzilla2fedmsg]=/usr/lib64/nagios/plugins/check_f command[check_fedmsg_cbacklog_fedimg_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedimgConsumer 2000 5000 command[check_fedmsg_cbacklog_hotness_backend]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub BugzillaTicketFiler 100 500 command[check_fedmsg_cbacklog_packages_backend_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub CacheInvalidator 30000 40000 -command[check_fedmsg_cbacklog_pdc_backend_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub PDCUpdater 10000 20000 command[check_fedmsg_cbacklog_mbs_backend_hub]=/usr/lib64/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub MBSConsumer 1000 2000 command[check_fedmsg_fmn_digest_last_ran]=/usr/lib64/nagios/plugins/check_fedmsg_producer_last_ran.py fedmsg-hub DigestProducer 90 600 diff --git a/roles/pdc/backend/files/pdc-audit.cron b/roles/pdc/backend/files/pdc-audit.cron deleted file mode 100644 index b3c7d67cad..0000000000 --- a/roles/pdc/backend/files/pdc-audit.cron +++ /dev/null @@ -1,3 +0,0 @@ -# run once a day and report -MAILTO=releng-cron@lists.fedoraproject.org -0 18 * * * root /usr/local/bin/lock-wrapper pdc-audit /usr/bin/pdc-updater-audit diff --git a/roles/pdc/backend/tasks/main.yml b/roles/pdc/backend/tasks/main.yml deleted file mode 100644 index f7c1d1f43e..0000000000 --- a/roles/pdc/backend/tasks/main.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -# Configuration for the pdc-updater backend consumer - -- name: remove the old pdc-updater repo - file: dest=/etc/yum.repos.d/ralph-pdc-updater-epel-7.repo state=absent - tags: pdc - -- name: install needed packages - package: name={{ item }} state=present - with_items: - - pdc-updater - tags: pdc - -- name: copy database configuration - template: > - src={{ item }} dest=/etc/fedmsg.d/{{ item }} - owner=fedmsg group=fedmsg mode=0600 - with_items: - - pdcupdater.py - notify: restart fedmsg-hub - tags: pdc - -- name: make sure /etc/pdc.d exists - file: path=/dev/pdc.d state=directory owner=root group=root - tags: pdc - -- name: copy client tool configuration - template: > - src={{ item }} dest=/etc/pdc.d/{{item}} - owner=fedmsg group=fedmsg mode=0600 - with_items: - - fedora.json - tags: pdc - -- name: setup cron for a daily audit script - copy: src=pdc-audit.cron dest=/etc/cron.d/pdc-audit.cron mode=0644 - tags: - - pdc - - cron diff --git a/roles/pdc/backend/templates/fedora.json b/roles/pdc/backend/templates/fedora.json deleted file mode 100644 index f61ba3dd39..0000000000 --- a/roles/pdc/backend/templates/fedora.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fedora": { - "develop": false, - "insecure": false, - - {% if env == 'staging' %} - "host": "https://pdc.stg.fedoraproject.org/rest_api/v1/", - "token": "{{pdc_updater_api_token_stg }}" - {% else %} - "host": "https://pdc.fedoraproject.org/rest_api/v1/", - "token": "{{pdc_updater_api_token_prod }}" - {% endif %} - } -} diff --git a/roles/pdc/backend/templates/pdcupdater.py b/roles/pdc/backend/templates/pdcupdater.py deleted file mode 100644 index 73bd223b3d..0000000000 --- a/roles/pdc/backend/templates/pdcupdater.py +++ /dev/null @@ -1,106 +0,0 @@ -# Configuration for the pdc-updater backend. - -config = { - # Should we turn on the realtime updater? - 'pdcupdater.enabled': True, - - {% if inventory_hostname.startswith('pdc-backend01') %} - # Use only one thread at a time to handle messages. If we have more than - # one, then we can end up POSTing multiple enormous JSON blobs to the PDC - # web frontend, and we'll send it into OOM death. One at a time, people.. - "moksha.workers_per_consumer": 1, - {% else %} - "moksha.workers_per_consumer": 8, - {% endif %} - - # Credentials to talk to PDC - 'pdcupdater.pdc': { - {% if env == 'staging' %} - 'server': 'http://pdc-web01.stg.iad2.fedoraproject.org/rest_api/v1/', - 'token': '{{pdc_updater_api_token_stg }}', - {% else %} - 'server': 'http://pdc-web01.iad2.fedoraproject.org/rest_api/v1/', - 'token': '{{pdc_updater_api_token_prod }}', - {% endif %} - }, - - # Credentials to talk to FAS - 'pdcupdater.fas': { - {% if env == 'staging' %} - 'base_url': 'https://admin.stg.fedoraproject.org/accounts', - {% else %} - 'base_url': 'https://admin.fedoraproject.org/accounts', - {% endif %} - 'username': '{{ fedoraDummyUser }}', - 'password': '{{ fedoraDummyUserPassword }}', - }, - - # MBS details - {% if env == 'staging' %} - 'pdcupdater.mbs_url': 'https://mbs.stg.fedoraproject.org/module-build-service/2/module-builds/', - {% else %} - 'pdcupdater.mbs_url': 'https://mbs.fedoraproject.org/module-build-service/2/module-builds/', - {% endif %} - - # dead.package details - {% if env == 'staging' %} - 'pdcupdater.file_check_url': 'https://src.stg.fedoraproject.org/%(namespace)s/%(repo)s/blob/%(branch)s/f/%(file)s', - {% else %} - 'pdcupdater.file_check_url': 'https://src.fedoraproject.org/%(namespace)s/%(repo)s/blob/%(branch)s/f/%(file)s', - {% endif %} - - # Koji details - {% if env == 'staging' %} - 'pdcupdater.koji_url': 'https://koji.stg.fedoraproject.org/kojihub', - {% else %} - 'pdcupdater.koji_url': 'http://koji01.iad2.fedoraproject.org/kojihub', - {% endif %} - # Use 8 threads to talk to koji in parallel. - 'pdcupdater.koji_io_threads': 8, - - # Where to find composes - {% if env == 'staging' %} - 'pdcupdater.old_composes_url': 'https://kojipkgs.stg.fedoraproject.org/compose/', - {% else %} - 'pdcupdater.old_composes_url': 'https://kojipkgs.fedoraproject.org/compose/', - {% endif %} - - # Where to find the fedora-atomic json definitions. - 'pdcupdater.fedora_atomic_git_url': 'https://pagure.io/fedora-atomic/raw/master/f/', - - # We have an explicit list of these in the config so we can turn them on - # and off individually in production if one is causing an issue. - 'pdcupdater.handlers': [ - # See CSI information on host for info on the different handlers. - {% if inventory_hostname.startswith('pdc-backend01') %} - 'pdcupdater.handlers.compose:NewComposeHandler', - {% elif inventory_hostname.startswith('pdc-backend02') %} - # For MBS https://fedoraproject.org/wiki/Changes/ModuleBuildService - 'pdcupdater.handlers.modules:ModuleStateChangeHandler', - # For https://fedoraproject.org/wiki/Changes/ArbitraryBranching - 'pdcupdater.handlers.retirement:RetireComponentHandler', - {% elif inventory_hostname.startswith('pdc-backend03') %} - ## https://fedoraproject.org/wiki/User:Ralph/Drafts/Infrastructure/Factory2/ModellingDeps - #'pdcupdater.handlers.depchain.rpms:NewRPMBuildTimeDepChainHandler', - #'pdcupdater.handlers.depchain.rpms:NewRPMRunTimeDepChainHandler', - 'pdcupdater.handlers.depchain.containers:ContainerRPMInclusionDepChainHandler', - {% endif %} - # This just isn't used for now.. but we can re-enable it if we need it. - #'pdcupdater.handlers.atomic:AtomicComponentGroupHandler', - ], - - 'logging': dict( - loggers=dict( - pdcupdater={ - "level": "DEBUG", - "propagate": False, - "handlers": ["console"], - }, - requests={ - "level": "INFO", - "propagate": False, - "handlers": ["console"], - }, - ) - ) -}