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

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 <gabrioux@redhat.com>
(cherry picked from commit c68b124ba8)
4.2rc
Guillaume Abrioux 2020-11-30 14:52:47 +01:00 committed by Dimitri Savineau
parent fe699897ed
commit ef154613c8
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-crash/templates/ceph-crash.service.j2
View File

@ -10,7 +10,7 @@ After=network.target
[Service] [Service]
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm -f ceph-crash-%i ExecStartPre=-/usr/bin/{{ container_binary }} rm -f ceph-crash-%i
ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-crash-%i \ ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-crash-%i \

2
roles/ceph-grafana/templates/grafana-server.service.j2
View File

@ -13,7 +13,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop grafana-server ExecStartPre=-/usr/bin/{{ container_binary }} stop grafana-server
{% endif %} {% endif %}

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

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-api ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-api
{% endif %} {% endif %}

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

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-gw ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-gw
{% endif %} {% endif %}

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

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop tcmu-runner ExecStartPre=-/usr/bin/{{ container_binary }} stop tcmu-runner
{% endif %} {% endif %}

2
roles/ceph-mds/templates/ceph-mds.service.j2
View File

@ -12,7 +12,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mds-{{ ansible_hostname }} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mds-{{ ansible_hostname }}
{% endif %} {% endif %}

2
roles/ceph-mgr/templates/ceph-mgr.service.j2
View File

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mgr-{{ ansible_hostname }} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mgr-{{ ansible_hostname }}
{% endif %} {% endif %}

2
roles/ceph-mon/templates/ceph-mon.service.j2
View File

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mon-%i ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mon-%i
ExecStartPre=/bin/sh -c '"$(command -v mkdir)" -p /etc/ceph /var/lib/ceph/mon' ExecStartPre=/bin/sh -c '"$(command -v mkdir)" -p /etc/ceph /var/lib/ceph/mon'

2
roles/ceph-nfs/templates/ceph-nfs.service.j2
View File

@ -12,7 +12,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-nfs-%i 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 ExecStartPre={{ '/bin/mkdir' if ansible_os_family == 'Debian' else '/usr/bin/mkdir' }} -p /etc/ceph /etc/ganesha /var/lib/nfs/ganesha /var/log/ganesha

2
roles/ceph-node-exporter/templates/node_exporter.service.j2
View File

@ -13,7 +13,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm -f node-exporter ExecStartPre=-/usr/bin/{{ container_binary }} rm -f node-exporter
ExecStart=/usr/bin/{{ container_binary }} run --rm --name=node-exporter \ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=node-exporter \

2
roles/ceph-osd/templates/ceph-osd.service.j2
View File

@ -13,7 +13,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-osd-%i ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-osd-%i
{% endif %} {% endif %}

2
roles/ceph-prometheus/templates/alertmanager.service.j2
View File

@ -14,7 +14,7 @@ WorkingDirectory={{ alertmanager_data_dir }}
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm -f alertmanager ExecStartPre=-/usr/bin/{{ container_binary }} rm -f alertmanager
ExecStart=/usr/bin/{{ container_binary }} run --rm --name=alertmanager \ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=alertmanager \

2
roles/ceph-prometheus/templates/prometheus.service.j2
View File

@ -13,7 +13,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% endif %}
ExecStartPre=-/usr/bin/{{ container_binary }} rm -f prometheus ExecStartPre=-/usr/bin/{{ container_binary }} rm -f prometheus
ExecStart=/usr/bin/{{ container_binary }} run --rm --name=prometheus \ ExecStart=/usr/bin/{{ container_binary }} run --rm --name=prometheus \

2
roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
View File

@ -11,7 +11,7 @@ After=network.target
EnvironmentFile=-/etc/environment EnvironmentFile=-/etc/environment
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rbd-mirror-{{ ansible_hostname }} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rbd-mirror-{{ ansible_hostname }}
{% endif %} {% endif %}

2
roles/ceph-rgw/templates/ceph-radosgw.service.j2
View File

@ -12,7 +12,7 @@ After=network.target
EnvironmentFile=/var/lib/ceph/radosgw/{{ cluster }}-%i/EnvironmentFile EnvironmentFile=/var/lib/ceph/radosgw/{{ cluster }}-%i/EnvironmentFile
{% if container_binary == 'podman' %} {% if container_binary == 'podman' %}
ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid 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 %} {% else %}
ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname }}-${INST_NAME} ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname }}-${INST_NAME}
{% endif %} {% endif %}