From 369f01589c6d2a26f03fe5e30f2ff210dd9fb826 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Tue, 10 Jan 2023 15:09:56 +0100
Subject: [PATCH] Remove rsync requirement for cinder

We used rsync to synchronize filters from rootwrap.d. However, with
smart-source that is not needed anymore, since /etc/cinder is simply
a symlink to the source directory of rsync. We still need os-brick
rootwrap linkage though.

Change-Id: Ib1571c5be67155b584c412da8336de49bc80d948
---
 tasks/cinder_install_source.yml | 13 -------------
 vars/debian.yml                 |  1 -
 vars/redhat.yml                 |  1 -
 3 files changed, 15 deletions(-)

diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml
index 05682455..d2bcd30f 100644
--- a/tasks/cinder_install_source.yml
+++ b/tasks/cinder_install_source.yml
@@ -43,16 +43,3 @@
     dest: /etc/cinder/rootwrap.d/os-brick.filters
     state: link
   ignore_errors: "{{ ansible_check_mode }}"
-
-- name: Copy cinder rootwrap filters
-  command: >-
-    rsync --archive --itemize-changes --delete
-    /openstack/venvs/cinder-{{ cinder_venv_tag }}/etc/cinder/rootwrap.d/
-    /etc/cinder/rootwrap.d/
-  args:
-    warn: no
-  register: _copy_rootwraps
-  changed_when: _copy_rootwraps.stdout | length > 0
-  notify:
-    - Restart cinder services
-    - Restart uwsgi services
diff --git a/vars/debian.yml b/vars/debian.yml
index 3fd45d1d..f37f1053 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -24,7 +24,6 @@ tgt_service_name: tgt
 cinder_distro_packages:
   - libkmod2
   - libxml2
-  - rsync
   - zlib1g
 
 cinder_service_distro_packages:
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 73a0e575..60947652 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -19,7 +19,6 @@ tgt_service_name: iscsid
 # Common yum packages
 cinder_distro_packages:
   - iscsi-initiator-utils
-  - rsync
   - kmod-libs
   - libxml2
   - which