From 2a6f7579f864675eef24b9a92d9db0a7147c6ca3 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Tue, 27 Aug 2024 12:26:22 +0100
Subject: [PATCH] Remove references to lsync and rsync

These were removed several releases ago and replaced with a
shared filesystem.

Change-Id: Icbfe9932c4078c15fad2fcd4128aed6c8dca25f8
---
 files/rsync.defaults        |  3 --
 files/rsyncd.conf           | 15 ----------
 tasks/main.yml              |  6 ----
 tasks/repo_sync_cleanup.yml | 59 -------------------------------------
 vars/debian.yml             |  3 --
 vars/redhat.yml             |  3 --
 6 files changed, 89 deletions(-)
 delete mode 100644 files/rsync.defaults
 delete mode 100644 files/rsyncd.conf
 delete mode 100644 tasks/repo_sync_cleanup.yml

diff --git a/files/rsync.defaults b/files/rsync.defaults
deleted file mode 100644
index 901038a..0000000
--- a/files/rsync.defaults
+++ /dev/null
@@ -1,3 +0,0 @@
-RSYNC_ENABLE=true
-RSYNC_CONFIG_FILE=/etc/rsyncd.conf
-RSYNC_OPTS=''
diff --git a/files/rsyncd.conf b/files/rsyncd.conf
deleted file mode 100644
index 12a2815..0000000
--- a/files/rsyncd.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
-lock file = /var/run/rsync.lock
-
-max connections = 15
-timeout = 600
-transfer logging = true
-
-[openstack_mirror]
-path = {{ repo_service_home_folder }}/repo
-comment = OpenStack Private Cloud Mirror Server
-use chroot = yes
-read only = yes
-uid = nobody
-gid = nogroup
diff --git a/tasks/main.yml b/tasks/main.yml
index de98fce..5ce824d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,12 +29,6 @@
   tags:
     - always
 
-# TODO (jrosser) Remove this task for the Z release
-- name: Including repo_sync_cleanup tasks
-  ansible.builtin.include_tasks: repo_sync_cleanup.yml
-  tags:
-    - repo_server-install
-
 - name: Including repo_pre_install tasks
   ansible.builtin.include_tasks: repo_pre_install.yml
   tags:
diff --git a/tasks/repo_sync_cleanup.yml b/tasks/repo_sync_cleanup.yml
deleted file mode 100644
index 94e2c69..0000000
--- a/tasks/repo_sync_cleanup.yml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-# Copyright 2022, BBC R&D
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Check rsyncd status
-  command: systemctl status "{{ rsyncd_service_name }}"
-  register: _rsyncd_status
-  failed_when: false
-  changed_when: false
-
-- name: Stop and uninstall rsyncd when service unit exists with or without error
-  block:
-    - name: Stop rsyncd
-      service:
-        name: "{{ rsyncd_service_name }}"
-        state: stopped
-        enabled: no
-
-    - name: Uninstall rsyncd
-      package:
-        name: "{{ rsyncd_service_name }}"
-        state: absent
-      when: rsyncd_service_name == 'rsyncd'
-  when: _rsyncd_status.rc == 0 or _rsyncd_status.rc == 3
-
-- name: Check lsyncd status
-  command: systemctl status lsyncd
-  register: _lsyncd_status
-  failed_when: false
-  changed_when: false
-
-- name: Stop and uninstall lsyncd when service unit exists with or without error
-  block:
-    - name: Stop lsyncd
-      service:
-        name: lsyncd
-        enabled: no
-
-    - name: Uninstall lsyncd
-      package:
-        name: "lsyncd"
-        state: absent
-  when: _lsyncd_status.rc == 0 or _lsyncd_status.rc == 3
-
-- name: Remove ssh keys and certificates
-  file:
-    path: "{{ repo_service_home_folder }}/.ssh"
-    state: absent
diff --git a/vars/debian.yml b/vars/debian.yml
index 6543683..66daf4c 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -52,9 +52,6 @@ _repo_apache_configs:
 _repo_apache_conf: "/etc/apache2/apache2.conf"
 _repo_apache_security_conf: "/etc/apache2/conf-available/security.conf"
 
-# NOTE(jrosser) remove this once rsync cleanup tasks are no longer required
-rsyncd_service_name: rsync
-
 repo_server_distro_packages:
   - git
   - apache2
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 356d7a6..2aa7119 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -41,9 +41,6 @@ _repo_apache_configs:
 _repo_apache_conf: "/etc/httpd/conf/httpd.conf"
 _repo_apache_security_conf: "{{ repo_apache_conf }}"
 
-# NOTE(jrosser) remove this when rsyncd cleanup task are no longer required
-rsyncd_service_name: rsyncd
-
 repo_server_distro_packages:
   - git
   - httpd