From 6405b77fa352c9ee4130d7041411f5ca5de09cfe Mon Sep 17 00:00:00 2001 From: Michal Konecny Date: Tue, 11 Feb 2025 11:54:17 +0100 Subject: [PATCH] Remove unused roles This is the PR based on the discussion https://discussion.fedoraproject.org/t/cleaning-of-ansible-repository/144403 and it removes the roles that are not called anywhere and we don't plan to use them in future. Signed-off-by: Michal Konecny --- .../files/builder-infrastructure.repo | 6 -- roles/builder_repo/tasks/main.yml | 5 -- .../fcomm-queue/files/fcomm-queue-collectd.py | 21 ------ .../fcomm-queue/files/fcomm-queue.conf | 4 -- .../files/selinux/fi-collectd-fcomm.mod | Bin 1522 -> 0 bytes .../files/selinux/fi-collectd-fcomm.pp | Bin 1538 -> 0 bytes .../files/selinux/fi-collectd-fcomm.te | 17 ----- roles/collectd/fcomm-queue/tasks/main.yml | 61 ------------------ roles/collectd/web-service/tasks/main.yml | 24 ------- .../templates/web-service-collectd.py | 31 --------- .../web-service/templates/web-service.conf | 4 -- roles/gitolite/base/tasks/main.yml | 11 ---- roles/koji_db/tasks/main.yml | 28 -------- 13 files changed, 212 deletions(-) delete mode 100644 roles/builder_repo/files/builder-infrastructure.repo delete mode 100644 roles/builder_repo/tasks/main.yml delete mode 100644 roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py delete mode 100644 roles/collectd/fcomm-queue/files/fcomm-queue.conf delete mode 100644 roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod delete mode 100644 roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.pp delete mode 100644 roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te delete mode 100644 roles/collectd/fcomm-queue/tasks/main.yml delete mode 100644 roles/collectd/web-service/tasks/main.yml delete mode 100644 roles/collectd/web-service/templates/web-service-collectd.py delete mode 100644 roles/collectd/web-service/templates/web-service.conf delete mode 100644 roles/gitolite/base/tasks/main.yml delete mode 100644 roles/koji_db/tasks/main.yml diff --git a/roles/builder_repo/files/builder-infrastructure.repo b/roles/builder_repo/files/builder-infrastructure.repo deleted file mode 100644 index ef6b4f23a4..0000000000 --- a/roles/builder_repo/files/builder-infrastructure.repo +++ /dev/null @@ -1,6 +0,0 @@ -[builder-infrastructure] -name=Builder Packages from Fedora Infrastructure $releasever - $basearch -baseurl=http://infrastructure.fedoraproject.org/repo/builder-rpms/$releasever/$basearch/ -enabled=1 -gpgcheck=1 -gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE diff --git a/roles/builder_repo/tasks/main.yml b/roles/builder_repo/tasks/main.yml deleted file mode 100644 index 917a89e8ef..0000000000 --- a/roles/builder_repo/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Add builder infra yum repo - ansible.builtin.file: dest=/etc/yum.repos.d/builder-infrastructure.repo state=absent - tags: - - builder_infra diff --git a/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py b/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py deleted file mode 100644 index 80978f87af..0000000000 --- a/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -import retask.queue -import socket -import time - -interval = 2 - -# Use FQDN -hostname = socket.gethostname() - -queue = retask.queue.Queue('fedora-packages') -queue.connect() - -while True: - print "PUTVAL %s/redis/queue_length interval=%i %i:%i" % ( - hostname, - interval, - int(time.time()), - queue.length, - ) - time.sleep(interval) diff --git a/roles/collectd/fcomm-queue/files/fcomm-queue.conf b/roles/collectd/fcomm-queue/files/fcomm-queue.conf deleted file mode 100644 index 44fe541a3a..0000000000 --- a/roles/collectd/fcomm-queue/files/fcomm-queue.conf +++ /dev/null @@ -1,4 +0,0 @@ -LoadPlugin exec - - Exec "redis" "/usr/local/bin/fcomm-queue-collectd" - diff --git a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod b/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod deleted file mode 100644 index c95ef0cd5b4e34429f86b8f587c6705ce520962a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1522 zcmb_cyG{c!5FFkJApw67(FZ|64GkSse1MhseBr>c(ZwgF;1~E{D$oS4SXp-|LPoOA z+MAty*xt|YkFPTT&kv)=CUncuQ>;4gb^)9K*a2{iUt9pFo3V}FJDaL;ZR32t2jJ%F z`aW|ssKF)v+*6N>@ZrtWjd%Om*1Ac>JweW4UIckZ01g1SrL$df+>+izn>_zff9BF8 zrB+LxXPN9~LNuwJgatXwKEAskX)#qvFHT>bO{UeQ4ebf)aj~1!6-`3>`O3ynH#5V8 zOghbOL-fUq^FDJ~vhXBLEj?|5Nj$c))tV&dXVNOQH7G+7(piG4T#^c-ie01R314SL zNIZQCrSCRk^mS*GI@k+hsE%9Jn@#JG$1@b;GUp)ByfP+lC9#gf+uO$xl)eJ?w2XI` zf0p*X^B>avk9}KUZ9E4VSaMJKpdPUa_+7QiP0T zd9|K>+TQQgVz~!^>k`1%YO%Zk@cJ}(Zv1RMcnQ_a*?jSINxyU}9VNDLKqOd|EGQF;&V$7`@vvnpT(AClmC?#ctBC_$0KQ ztIFW(W^9;{iRa0zk3M~~&Lu8O7M`T3U5^@XBCjoPwI<2^nYd1E1M*OWbe5o3E=h$^ zMX!+RwQ za$5m=n#X%chq=D%{`>s?N53nuHr|5_EP1Eg`35+gw2m_QGC}lvlL?Vc0d3BSpnttS S;{;g$a;@Z#|NGVYqzgZR8fcaP diff --git a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te b/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te deleted file mode 100644 index bb7c6ec5d0..0000000000 --- a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te +++ /dev/null @@ -1,17 +0,0 @@ - -module fi-collectd-fcomm 1.0; - -require { - type bin_t; - type collectd_t; - type ldconfig_exec_t; - type shell_exec_t; - class file { read getattr open ioctl execute execute_no_trans }; - class lnk_file { read }; -} - -allow collectd_t bin_t:file ioctl; -allow collectd_t bin_t:lnk_file read; -allow collectd_t ldconfig_exec_t:file { read execute open execute_no_trans }; - -allow collectd_t shell_exec_t:file { getattr execute_no_trans }; diff --git a/roles/collectd/fcomm-queue/tasks/main.yml b/roles/collectd/fcomm-queue/tasks/main.yml deleted file mode 100644 index a50b6f2e77..0000000000 --- a/roles/collectd/fcomm-queue/tasks/main.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- - -- name: Install python-retask - ansible.builtin.package: name=python-retask state=present - tags: - - collectd - -- name: Copy in /usr/local/bin/fcomm-queue-collectd - ansible.builtin.copy: > - src=fcomm-queue-collectd.py - dest=/usr/local/bin/fcomm-queue-collectd - mode=0755 - tags: - - collectd - notify: Restart collectd - -- name: Copy in /etc/collectd.d/fcomm-queue.conf - ansible.builtin.copy: > - src=fcomm-queue.conf - dest=/etc/collectd.d/fcomm-queue-conf - tags: - - collectd - notify: Restart collectd - -# Three tasks for handling our custom selinux module. -- name: Ensure a directory exists for our custom selinux module - ansible.builtin.file: dest=/usr/share/collectd state=directory - tags: - - collectd - - selinux - -- name: Copy over our fcomm collectd selinux module - ansible.builtin.copy: src=selinux/fi-collectd-fcomm.pp dest=/usr/share/collectd/fi-collectd-fcomm.pp - register: ficfcomm_module - tags: - - collectd - - selinux - -- name: Check to see if its even installed yet - ansible.builtin.shell: semodule -l | grep fi-collectd-fcomm | wc -l - register: ficfcomm_grep - check_mode: no - changed_when: "'0' in ficfcomm_grep.stdout" - tags: - - collectd - - selinux - -- name: Install our fcomm collectd selinux module - ansible.builtin.command: semodule -i /usr/share/collectd/fi-collectd-fcomm.pp - when: ficfcomm_module is changed or ficfcomm_grep is changed - tags: - - collectd - - selinux - -- name: Lastly, set some selinux booleans - seboolean: name={{item}} persistent=yes state=yes - with_items: - - collectd_tcp_network_connect - tags: - - collectd - - selinux diff --git a/roles/collectd/web-service/tasks/main.yml b/roles/collectd/web-service/tasks/main.yml deleted file mode 100644 index 22ee219c9f..0000000000 --- a/roles/collectd/web-service/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -- name: Copy in /usr/local/bin/web-service-collectd - ansible.builtin.template: > - src=web-service-collectd.py - dest="/usr/local/bin/web-service-collectd-{{ site }}" - mode=0755 - tags: - - collectd - notify: Restart collectd - -- name: Copy in /etc/collectd.d/web-service.conf - ansible.builtin.template: > - src=web-service.conf - dest=/etc/collectd.d/{{ site }}.conf - tags: - - collectd - notify: Restart collectd - -- name: Let collectd talk to apache over tcp - seboolean: name=collectd_tcp_network_connect state=yes persistent=yes - tags: - - collectd - ignore_errors: true diff --git a/roles/collectd/web-service/templates/web-service-collectd.py b/roles/collectd/web-service/templates/web-service-collectd.py deleted file mode 100644 index a29935c815..0000000000 --- a/roles/collectd/web-service/templates/web-service-collectd.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python -""" monitor website request times for collectd """ - -import time -import socket -import urllib - - -hostname = socket.gethostname() # Use FQDN, I guess.. - - -def get_loadtime(url): - start = time.time() - _ = urllib.urlopen(url) - return time.time() - start - - -if __name__ == '__main__': - site = "{{ site }}" - url = "{{ url }}" - interval = int("{{ interval }}") - - try: - while True: - loadtime = get_loadtime(url) - timestamp = int(time.time()) - print "PUTVAL %s/%s/delay-%s interval=%i %i:%f" % ( - hostname, 'web', site, interval, timestamp, loadtime) - time.sleep((interval - (loadtime % interval)) % interval) - except KeyboardInterrupt: - pass diff --git a/roles/collectd/web-service/templates/web-service.conf b/roles/collectd/web-service/templates/web-service.conf deleted file mode 100644 index 8cd8116e74..0000000000 --- a/roles/collectd/web-service/templates/web-service.conf +++ /dev/null @@ -1,4 +0,0 @@ -LoadPlugin exec - - Exec "nobody" "/usr/local/bin/web-service-collectd-{{ site }}" - diff --git a/roles/gitolite/base/tasks/main.yml b/roles/gitolite/base/tasks/main.yml deleted file mode 100644 index af550810f5..0000000000 --- a/roles/gitolite/base/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# tasklist for setting up a basic gitolite - -- name: Install the needed packages - ansible.builtin.package: name={{item}} state=present - with_items: - - gitolite3 - - perl-Sys-Syslog - -- name: Ensure the /etc/gitolite directory - ansible.builtin.file: path=/etc/gitolite owner=root group=root mode=0755 state=directory diff --git a/roles/koji_db/tasks/main.yml b/roles/koji_db/tasks/main.yml deleted file mode 100644 index 7f8dc04e1c..0000000000 --- a/roles/koji_db/tasks/main.yml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# -# These tasks only run on koji db servers from the postgresql playbook -# -# -# create a koji db user to own the db with the kojidatabasepassword from private -# -- name: Koji db user - postgresql_user: name=koji password={{ aarch64kojidatabasepassword }} - tags: - - db - when: is_kojidb == "True" -# -# create a koji database if not already created -# -- name: Databases creation - postgresql_db: name=koji owner=koji encoding=UTF-8 - tags: - - db - when: is_kojidb == "True" -# -# Load the initial schema and create a file to note that it's loaded now. -# -- name: Load initial schema - ansible.builtin.shell: creates=/var/lib/pgql/koji-schema psql koji koji < /usr/share/doc/koji*/docs/schema.sql - tags: - - db - when: is_kojidb == "True"