From febd99eb6900644977f62ecdfcae107b9b7e1c65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sun, 20 Jun 2021 18:10:44 +0000
Subject: [PATCH] Make Cinder with iSCSI use fewer volumes

These are not used by the relevant daemons and so can be dropped to,
e.g., avoid creating the cinder volume on hosts where there is no
cinder.

Change-Id: Ia8d906a9e0227f361883a7ec1ec8dcd73e4104dc
---
 ansible/roles/iscsi/defaults/main.yml      | 3 ---
 ansible/roles/multipathd/defaults/main.yml | 2 --
 2 files changed, 5 deletions(-)

diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml
index 0506cf8f5f..ceee34eff5 100644
--- a/ansible/roles/iscsi/defaults/main.yml
+++ b/ansible/roles/iscsi/defaults/main.yml
@@ -45,7 +45,6 @@ iscsid_default_volumes:
   - "/run/:/run/:shared"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
-  - "cinder:/var/lib/cinder"
   - "iscsi_info:/etc/iscsi"
 tgtd_default_volumes:
   - "{{ node_config_directory }}/tgtd/:{{ container_config_directory }}/:ro"
@@ -56,8 +55,6 @@ tgtd_default_volumes:
   - "/run/:/run/:shared"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
-  - "cinder:/var/lib/cinder"
-  - "iscsi_info:/etc/iscsi"
 iscsid_extra_volumes: "{{ default_extra_volumes }}"
 tgtd_extra_volumes: "{{ default_extra_volumes }}"
 
diff --git a/ansible/roles/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml
index 26ea84d9df..0d098d9deb 100644
--- a/ansible/roles/multipathd/defaults/main.yml
+++ b/ansible/roles/multipathd/defaults/main.yml
@@ -26,6 +26,4 @@ multipathd_default_volumes:
   - "/run/:/run/:shared"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
-  - "cinder:/var/lib/cinder"
-  - "iscsi_info:/etc/iscsi"
 multipathd_extra_volumes: "{{ default_extra_volumes }}"