iscsigw: remove `--cap-add=all` from `podman run` cmd

As of podman `2.0.5`, `--cap-add` and `--privileged` are exclusive
options.

```
Nov 30 13:56:30 magna089 podman[171677]: Error: invalid config provided: CapAdd and privileged are mutually exclusive options
```

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1902149
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit d40dd764e004f9765e5d4e12507cdf3c707a3271)

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
index 39cf012bd9dc0e86bb65b0951673827d2451a4a0..3f2f594f036e48c9d55d5db51872448889a3e9f7 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
@@ -28,7 +28,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   {% endif -%}
   -v /etc/localtime:/etc/localtime:ro \
   --privileged \
-  --cap-add=ALL \
   --net=host \
   -v /dev:/dev \
   -v /dev/log:/dev/log \

diff --git a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
index aeec124888bda7b738d32527162d2d23f0aa469e..ef56edb3c61b05ce0e4ce4e7e23ef06d76b3291b 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
+++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
@@ -28,7 +28,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   {% endif -%}
   -v /etc/localtime:/etc/localtime:ro \
   --privileged \
-  --cap-add=ALL \
   --net=host \
   -v /dev:/dev \
   -v /dev/log:/dev/log \

diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
index c48616e30d95c9ac9a94beb16184b7b6a535c3b7..b488acf1e18175a6487a8dd298f52ef3e0a35f2f 100644 (file)
--- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
+++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
@@ -29,7 +29,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   -v /etc/localtime:/etc/localtime:ro \
   --privileged \
   --net=host \
-  --cap-add=ALL \
   -v /dev:/dev \
   -v /lib/modules:/lib/modules \
   -v /etc/ceph:/etc/ceph \