From 257a130bc81bb92b3b1ca2733a89c264f75cbbdf Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 22 Jul 2020 15:22:37 -0400 Subject: [PATCH] remove zanata2fedmsg. the zanata roles are still there for the time being as they are tied into webstizes and such --- ...zanata2fedmsg01.stg.phx2.fedoraproject.org | 21 ------- inventory/inventory | 6 -- master.yml | 1 - playbooks/groups/zanata2fedmsg.yml | 60 ------------------- playbooks/include/proxies-reverseproxy.yml | 7 --- roles/fedmsg/base/tasks/main.yml | 1 - roles/haproxy/templates/haproxy.cfg | 8 --- roles/zanata2fedmsg/files/zanata2fedmsg.wsgi | 11 ---- roles/zanata2fedmsg/tasks/main.yml | 54 ----------------- .../templates/zanata2fedmsg.conf | 13 ---- .../zanata2fedmsg/templates/zanata2fedmsg.ini | 1 - 11 files changed, 183 deletions(-) delete mode 100644 inventory/host_vars/zanata2fedmsg01.stg.phx2.fedoraproject.org delete mode 100644 playbooks/groups/zanata2fedmsg.yml delete mode 100644 roles/zanata2fedmsg/files/zanata2fedmsg.wsgi delete mode 100644 roles/zanata2fedmsg/tasks/main.yml delete mode 100644 roles/zanata2fedmsg/templates/zanata2fedmsg.conf delete mode 100644 roles/zanata2fedmsg/templates/zanata2fedmsg.ini diff --git a/inventory/host_vars/zanata2fedmsg01.stg.phx2.fedoraproject.org b/inventory/host_vars/zanata2fedmsg01.stg.phx2.fedoraproject.org deleted file mode 100644 index b62a34db75..0000000000 --- a/inventory/host_vars/zanata2fedmsg01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,21 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 - -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -volgroup: /dev/vg_guests -vmhost: virthost01.stg.phx2.fedoraproject.org -datacenter: phx2 - -tcp_ports: ['80'] - -eth0_ip: 10.5.128.189 -csi_relationship: | - zanata2fedmsg is a tiny webapp that receives a webhook POST from - fedora.zanata.org and then republishes that data to our fedmsg bus. - - It also has a cronjob that periodically wakes up, logs into - fedora.zanata.org and adds our webhook URL to all projects where it is - absent. diff --git a/inventory/inventory b/inventory/inventory index 2b18d9cfd0..2c95ef2eac 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -639,7 +639,6 @@ vmhost-x86-08.stg.iad2.fedoraproject.org vmhost-x86-09.stg.iad2.fedoraproject.org vmhost-x86-10.stg.iad2.fedoraproject.org # wiki01.stg.iad2.fedoraproject.org -# zanata2fedmsg01.stg.iad2.fedoraproject.org # This is a list of hosts that are a little "friendly" with staging. # They are exempted from the iptables wall between staging and prod. @@ -720,11 +719,6 @@ qvmhost-x86-02.iad2.fedoraproject.org wiki01.iad2.fedoraproject.org wiki02.iad2.fedoraproject.org -[zanata2fedmsg_stg] -# zanata2fedmsg01.stg.iad2.fedoraproject.org - -[zanata2fedmsg] - # assorted categories of fedmsg services, for convenience [fedmsg_hubs:children] badges_backend diff --git a/master.yml b/master.yml index aab6e4f1ce..8bbc71622a 100644 --- a/master.yml +++ b/master.yml @@ -86,7 +86,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml #### # # Openshift apps diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml deleted file mode 100644 index 5885b0e2a7..0000000000 --- a/playbooks/groups/zanata2fedmsg.yml +++ /dev/null @@ -1,60 +0,0 @@ -# create a new zanata2fedmsg server -# NOTE: should be used with --limit most of the time -# NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars_path come from group_vars/zanata2fedmsg* or from hostvars - -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg_stg" - -- name: make the box be real - hosts: zanata2fedmsg:zanata2fedmsg_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 - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - rsyncd - - sudo - - { role: openvpn/client, - when: env != "staging" } - - mod_wsgi - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -- name: deploy service-specific config - hosts: zanata2fedmsg:zanata2fedmsg_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: - - zanata2fedmsg - - { role: fedmsg/base, - when: deployment_type == "prod" } - # Set up for fedora-messaging - - { role: rabbit/user, - username: "zanata{{ env_suffix }}"} diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index 7637e7fc50..cbeaae7c75 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -385,13 +385,6 @@ header_scheme: true tags: pdc - - role: httpd/reverseproxy - website: apps.fedoraproject.org - destname: zanata2fedmsg - localpath: /zanata2fedmsg - remotepath: /zanata2fedmsg - proxyurl: http://localhost:10046 - - role: httpd/reverseproxy website: admin.fedoraproject.org destname: yk-val diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index 30d11bda2a..54cdff06ca 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -105,7 +105,6 @@ - endpoints-mailman.py - endpoints-fedimg.py - endpoints-bugzilla2fedmsg.py - - endpoints-bodhi.py - endpoints-odcs-backend.py - relay.py - logging.py diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 8cb92194d9..cb380524a2 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -235,14 +235,6 @@ backend pdc-backend timeout server 3600000 timeout connect 3600000 -frontend zanata2fedmsg-frontend - bind 0.0.0.0:10046 - default_backend zanata2fedmsg-backend - -backend zanata2fedmsg-backend - balance hdr(appserver) - server zanata2fedmsg01 zanata2fedmsg01:80 check inter 10s rise 1 fall 2 - frontend osbs-frontend bind 0.0.0.0:10047 default_backend osbs-backend diff --git a/roles/zanata2fedmsg/files/zanata2fedmsg.wsgi b/roles/zanata2fedmsg/files/zanata2fedmsg.wsgi deleted file mode 100644 index fdeceed15a..0000000000 --- a/roles/zanata2fedmsg/files/zanata2fedmsg.wsgi +++ /dev/null @@ -1,11 +0,0 @@ -import sys -sys.stdout = sys.stderr - -import os -os.environ['PYTHON_EGG_CACHE'] = '/var/www/.python-eggs' -os.environ['ZANATA2FEDMSG_CONFIG'] = '/etc/zanata2fedmsg.ini' - -import logging -logging.basicConfig(level='INFO') - -from zanata2fedmsg import app as application diff --git a/roles/zanata2fedmsg/tasks/main.yml b/roles/zanata2fedmsg/tasks/main.yml deleted file mode 100644 index bc786d054a..0000000000 --- a/roles/zanata2fedmsg/tasks/main.yml +++ /dev/null @@ -1,54 +0,0 @@ ---- -# Configuration for the tahrir webapp - -- name: install needed packages - package: name={{ item }} state=present enablerepo=epel-testing - with_items: - - python-zanata2fedmsg - - libsemanage-python - tags: - - packages - - zanata2fedmsg - -- name: make some directories - file: dest="{{item}}" mode=0755 state=directory - with_items: - - /usr/share/zanata2fedmsg - tags: - - zanata2fedmsg - -- name: copy zanata2fedmsg configuration file - template: > - src={{ item }} dest="/etc/{{item}}" - owner=apache group=apache mode=0640 - with_items: - - zanata2fedmsg.ini - tags: - - config - - zanata2fedmsg - notify: - - restart apache - -- name: copy zanata2fedmsg wsgi script - copy: > - src={{ item }} dest="/usr/share/zanata2fedmsg/{{ item }}" - owner=apache group=apache mode=0644 - with_items: - - zanata2fedmsg.wsgi - tags: - - config - - zanata2fedmsg - notify: - - restart apache - -- name: copy zanata2fedmsg httpd config - template: > - src={{ item }} dest="/etc/httpd/conf.d/{{ item }}" - owner=apache group=apache mode=0644 - with_items: - - zanata2fedmsg.conf - tags: - - config - - zanata2fedmsg - notify: - - restart apache diff --git a/roles/zanata2fedmsg/templates/zanata2fedmsg.conf b/roles/zanata2fedmsg/templates/zanata2fedmsg.conf deleted file mode 100644 index 07fac90cba..0000000000 --- a/roles/zanata2fedmsg/templates/zanata2fedmsg.conf +++ /dev/null @@ -1,13 +0,0 @@ -WSGIDaemonProcess zanata2fedmsg user=apache group=apache maximum-requests=1000 display-name=zanata2fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}} -WSGISocketPrefix run/wsgi -WSGIRestrictStdout On -WSGIRestrictSignal Off -WSGIPythonOptimize 1 - -WSGIScriptAlias /zanata2fedmsg /usr/share/zanata2fedmsg/zanata2fedmsg.wsgi - - - WSGIProcessGroup zanata2fedmsg - Require all granted - - diff --git a/roles/zanata2fedmsg/templates/zanata2fedmsg.ini b/roles/zanata2fedmsg/templates/zanata2fedmsg.ini deleted file mode 100644 index c8f9899da0..0000000000 --- a/roles/zanata2fedmsg/templates/zanata2fedmsg.ini +++ /dev/null @@ -1 +0,0 @@ -WEBHOOK_SALT = '{{zanata2fedmsg_webhook_salt}}'