]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
iscsigw: remove `--cap-add=all` from `podman run` cmd
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 30 Nov 2020 13:55:16 +0000 (14:55 +0100)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Mon, 30 Nov 2020 17:24:11 +0000 (12:24 -0500)
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>
roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2

index 48d02be0f5ab4503165f8768ed9f24a506491c9b..484b0f93e02537b8399c3a02361ff0d31409098b 100644 (file)
@@ -24,7 +24,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   --cpus={{ ceph_rbd_target_api_docker_cpu_limit }} \
   -v /etc/localtime:/etc/localtime:ro \
   --privileged \
-  --cap-add=ALL \
   --net=host \
   -v /dev:/dev \
   -v /dev/log:/dev/log \
index 96d51eb311df6e32e3cce91847ed2b0530fe1bee..b6baf8c3238995cd2a509877e7e63bea99621cce 100644 (file)
@@ -24,7 +24,6 @@ ExecStart=/usr/bin/{{ container_binary }} run --rm \
   --cpus={{ ceph_rbd_target_gw_docker_cpu_limit }} \
   -v /etc/localtime:/etc/localtime:ro \
   --privileged \
-  --cap-add=ALL \
   --net=host \
   -v /dev:/dev \
   -v /dev/log:/dev/log \
index d42506df08d6512e16af5e0985329e4661565a2f..5809ed3569052b24941314a6025baa519ebe6572 100644 (file)
@@ -25,7 +25,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 \