From 286a03bad20955aa4d3f7009cef5856d328b76f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Mon, 31 May 2021 12:47:48 +0000
Subject: [PATCH] Drop /sys/fs/cgroup mounts

They are handled by Docker since at least 18.09 (tested).
Backport to Wallaby at most to not introduce needless restarts in
already stable branches.

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/792583
Change-Id: Ia95355c529f1b0222dc1de06632984b6d130b9ec
---
 ansible/roles/iscsi/defaults/main.yml      | 2 --
 ansible/roles/multipathd/defaults/main.yml | 1 -
 ansible/roles/nova-cell/defaults/main.yml  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/ansible/roles/iscsi/defaults/main.yml b/ansible/roles/iscsi/defaults/main.yml
index b088a56ab2..25280c69d5 100644
--- a/ansible/roles/iscsi/defaults/main.yml
+++ b/ansible/roles/iscsi/defaults/main.yml
@@ -46,7 +46,6 @@ iscsid_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
   - "/dev/:/dev/"
   - "/run/:/run/:shared"
-  - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
   - "cinder:/var/lib/cinder"
@@ -58,7 +57,6 @@ tgtd_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
   - "/dev/:/dev/"
   - "/run/:/run/:shared"
-  - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
   - "cinder:/var/lib/cinder"
diff --git a/ansible/roles/multipathd/defaults/main.yml b/ansible/roles/multipathd/defaults/main.yml
index 188314acba..dc5b0cd19d 100644
--- a/ansible/roles/multipathd/defaults/main.yml
+++ b/ansible/roles/multipathd/defaults/main.yml
@@ -27,7 +27,6 @@ multipathd_default_volumes:
   - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
   - "/dev/:/dev/"
   - "/run/:/run/:shared"
-  - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
   - "/lib/modules:/lib/modules:ro"
   - "/sys/kernel/config:/configfs"
   - "cinder:/var/lib/cinder"
diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml
index 6c252ecf35..6e85450f14 100644
--- a/ansible/roles/nova-cell/defaults/main.yml
+++ b/ansible/roles/nova-cell/defaults/main.yml
@@ -327,7 +327,6 @@ nova_libvirt_default_volumes:
   - "/lib/modules:/lib/modules:ro"
   - "/run/:/run/:shared"
   - "/dev:/dev"
-  - "/sys/fs/cgroup:/sys/fs/cgroup"
   - "kolla_logs:/var/log/kolla/"
   - "libvirtd:/var/lib/libvirt"
   - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"