From ef154613c8128d352878ff5b0f182118eb8ea18b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 30 Nov 2020 14:52:47 +0100 Subject: [PATCH] container: remove `--ignore` from `podman rm` command As of podman 2.0.5, `--ignore` param conflicts with `--storage`. ``` Nov 30 13:53:10 magna089 podman[164443]: Error: --storage conflicts with --volumes, --all, --latest, --ignore and --cidfile ``` Signed-off-by: Guillaume Abrioux (cherry picked from commit c68b124ba89e0e4e7c4845b6dd1ce98be8e074d4) --- roles/ceph-crash/templates/ceph-crash.service.j2 | 2 +- roles/ceph-grafana/templates/grafana-server.service.j2 | 2 +- roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 | 2 +- roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 | 2 +- roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 | 2 +- roles/ceph-mds/templates/ceph-mds.service.j2 | 2 +- roles/ceph-mgr/templates/ceph-mgr.service.j2 | 2 +- roles/ceph-mon/templates/ceph-mon.service.j2 | 2 +- roles/ceph-nfs/templates/ceph-nfs.service.j2 | 2 +- roles/ceph-node-exporter/templates/node_exporter.service.j2 | 2 +- roles/ceph-osd/templates/ceph-osd.service.j2 | 2 +- roles/ceph-prometheus/templates/alertmanager.service.j2 | 2 +- roles/ceph-prometheus/templates/prometheus.service.j2 | 2 +- roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 | 2 +- roles/ceph-rgw/templates/ceph-radosgw.service.j2 | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/roles/ceph-crash/templates/ceph-crash.service.j2 b/roles/ceph-crash/templates/ceph-crash.service.j2 index d970bda62..624420023 100644 --- a/roles/ceph-crash/templates/ceph-crash.service.j2 +++ b/roles/ceph-crash/templates/ceph-crash.service.j2 @@ -10,7 +10,7 @@ After=network.target [Service] {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-crash-%i +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-crash-%i {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm -f ceph-crash-%i ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-crash-%i \ diff --git a/roles/ceph-grafana/templates/grafana-server.service.j2 b/roles/ceph-grafana/templates/grafana-server.service.j2 index 1346014c9..1fb57f316 100644 --- a/roles/ceph-grafana/templates/grafana-server.service.j2 +++ b/roles/ceph-grafana/templates/grafana-server.service.j2 @@ -13,7 +13,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage grafana-server +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage grafana-server {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop grafana-server {% endif %} 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 c348ad425..39cf012bd 100644 --- a/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 +++ b/roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage rbd-target-api +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage rbd-target-api {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-api {% endif %} 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 5db2caf0c..aeec12488 100644 --- a/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 +++ b/roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage rbd-target-gw +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage rbd-target-gw {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-gw {% endif %} diff --git a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 index a33be81fb..c48616e30 100644 --- a/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 +++ b/roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage tcmu-runner +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage tcmu-runner {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop tcmu-runner {% endif %} diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2 index 22053939e..fa84c6bf7 100644 --- a/roles/ceph-mds/templates/ceph-mds.service.j2 +++ b/roles/ceph-mds/templates/ceph-mds.service.j2 @@ -12,7 +12,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-mds-{{ ansible_hostname }} +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-mds-{{ ansible_hostname }} {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mds-{{ ansible_hostname }} {% endif %} diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2 index 377759866..9947de9eb 100644 --- a/roles/ceph-mgr/templates/ceph-mgr.service.j2 +++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-mgr-{{ ansible_hostname }} +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-mgr-{{ ansible_hostname }} {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mgr-{{ ansible_hostname }} {% endif %} diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index b5efadb10..2426b5f18 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-mon-%i +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-mon-%i {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mon-%i ExecStartPre=/bin/sh -c '"$(command -v mkdir)" -p /etc/ceph /var/lib/ceph/mon' diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2 index 854f7e04b..1f749cd5a 100644 --- a/roles/ceph-nfs/templates/ceph-nfs.service.j2 +++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2 @@ -12,7 +12,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-nfs-%i +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-nfs-%i {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-nfs-%i ExecStartPre={{ '/bin/mkdir' if ansible_os_family == 'Debian' else '/usr/bin/mkdir' }} -p /etc/ceph /etc/ganesha /var/lib/nfs/ganesha /var/log/ganesha diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2 index 070bda94a..d3228a119 100644 --- a/roles/ceph-node-exporter/templates/node_exporter.service.j2 +++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2 @@ -13,7 +13,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage node-exporter +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage node-exporter {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm -f node-exporter ExecStart=/usr/bin/{{ container_binary }} run --rm --name=node-exporter \ diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2 index 3d5b1eaf3..73f8190d2 100644 --- a/roles/ceph-osd/templates/ceph-osd.service.j2 +++ b/roles/ceph-osd/templates/ceph-osd.service.j2 @@ -13,7 +13,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-osd-%i +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-osd-%i {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-osd-%i {% endif %} diff --git a/roles/ceph-prometheus/templates/alertmanager.service.j2 b/roles/ceph-prometheus/templates/alertmanager.service.j2 index d931793dc..6aba7709e 100644 --- a/roles/ceph-prometheus/templates/alertmanager.service.j2 +++ b/roles/ceph-prometheus/templates/alertmanager.service.j2 @@ -14,7 +14,7 @@ WorkingDirectory={{ alertmanager_data_dir }} EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage alertmanager +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage alertmanager {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm -f alertmanager ExecStart=/usr/bin/{{ container_binary }} run --rm --name=alertmanager \ diff --git a/roles/ceph-prometheus/templates/prometheus.service.j2 b/roles/ceph-prometheus/templates/prometheus.service.j2 index abc99f349..3a17da6f0 100644 --- a/roles/ceph-prometheus/templates/prometheus.service.j2 +++ b/roles/ceph-prometheus/templates/prometheus.service.j2 @@ -13,7 +13,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage prometheus +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage prometheus {% endif %} ExecStartPre=-/usr/bin/{{ container_binary }} rm -f prometheus ExecStart=/usr/bin/{{ container_binary }} run --rm --name=prometheus \ diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 index 558589534..191100bec 100644 --- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 +++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 @@ -11,7 +11,7 @@ After=network.target EnvironmentFile=-/etc/environment {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-rbd-mirror-{{ ansible_hostname }} +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-rbd-mirror-{{ ansible_hostname }} {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rbd-mirror-{{ ansible_hostname }} {% endif %} diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 index 626fa300d..aaa8f3a1f 100644 --- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 +++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 @@ -12,7 +12,7 @@ After=network.target EnvironmentFile=/var/lib/ceph/radosgw/{{ cluster }}-%i/EnvironmentFile {% if container_binary == 'podman' %} ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStartPre=-/usr/bin/{{ container_binary }} rm --ignore --storage ceph-rgw-{{ ansible_hostname }}-${INST_NAME} +ExecStartPre=-/usr/bin/{{ container_binary }} rm --storage ceph-rgw-{{ ansible_hostname }}-${INST_NAME} {% else %} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname }}-${INST_NAME} {% endif %} -- 2.39.5