ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 d40dd764e0)
4.2rc
Guillaume Abrioux 2020-11-30 14:55:16 +01:00 committed by Dimitri Savineau
parent ef154613c8
commit 0d22598806
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
View File

@ -28,7 +28,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
{% endif -%} {% endif -%}
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--privileged \ --privileged \
--cap-add=ALL \
--net=host \ --net=host \
-v /dev:/dev \ -v /dev:/dev \
-v /dev/log:/dev/log \ -v /dev/log:/dev/log \

1
roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
View File

@ -28,7 +28,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
{% endif -%} {% endif -%}
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--privileged \ --privileged \
--cap-add=ALL \
--net=host \ --net=host \
-v /dev:/dev \ -v /dev:/dev \
-v /dev/log:/dev/log \ -v /dev/log:/dev/log \

1
roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
View File

@ -29,7 +29,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
--privileged \ --privileged \
--net=host \ --net=host \
--cap-add=ALL \
-v /dev:/dev \ -v /dev:/dev \
-v /lib/modules:/lib/modules \ -v /lib/modules:/lib/modules \
-v /etc/ceph:/etc/ceph \ -v /etc/ceph:/etc/ceph \