mirror of https://github.com/ceph/ceph-ansible.git
podman: force log driver to journald
Since we've changed to podman configuration using the detach mode and
systemd type to forking then the container logs aren't present in the
journald anymore.
The default conmon log driver is using k8s-file.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1890439
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 16cd183b9c
)
pull/5995/head
parent
34a310e5f4
commit
f344fe6f92
|
@ -14,7 +14,7 @@ ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
|
||||||
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 \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--net=host \
|
--net=host \
|
||||||
-v /var/lib/ceph:/var/lib/ceph:z \
|
-v /var/lib/ceph:/var/lib/ceph:z \
|
||||||
|
|
|
@ -19,7 +19,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop grafana-server
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm grafana-server
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm grafana-server
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --name=grafana-server \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --name=grafana-server \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v /etc/grafana:/etc/grafana:Z \
|
-v /etc/grafana:/etc/grafana:Z \
|
||||||
-v /var/lib/grafana:/var/lib/grafana:Z \
|
-v /var/lib/grafana:/var/lib/grafana:Z \
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-api
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm rbd-target-api
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm rbd-target-api
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_rbd_target_api_docker_memory_limit }} \
|
--memory={{ ceph_rbd_target_api_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop rbd-target-gw
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm rbd-target-gw
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm rbd-target-gw
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_rbd_target_gw_docker_memory_limit }} \
|
--memory={{ ceph_rbd_target_gw_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop tcmu-runner
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm tcmu-runner
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm tcmu-runner
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_tcmu_runner_docker_memory_limit }} \
|
--memory={{ ceph_tcmu_runner_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -18,7 +18,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mds-{{ ansible_hostname
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mds-{{ ansible_hostname }}
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mds-{{ ansible_hostname }}
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_mds_docker_memory_limit }} \
|
--memory={{ ceph_mds_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-mgr-{{ ansible_hostname
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mgr-{{ ansible_hostname }}
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-mgr-{{ ansible_hostname }}
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_mgr_docker_memory_limit }} \
|
--memory={{ ceph_mgr_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -16,7 +16,7 @@ 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'
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-mon-%i \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --name ceph-mon-%i \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_mon_docker_memory_limit }} \
|
--memory={{ ceph_mon_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -17,7 +17,7 @@ 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
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v /var/lib/ceph:/var/lib/ceph:z \
|
-v /var/lib/ceph:/var/lib/ceph:z \
|
||||||
-v /etc/ceph:/etc/ceph:z \
|
-v /etc/ceph:/etc/ceph:z \
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
|
||||||
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 \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--privileged \
|
--privileged \
|
||||||
-v /proc:/host/proc:ro -v /sys:/host/sys:ro \
|
-v /proc:/host/proc:ro -v /sys:/host/sys:ro \
|
||||||
|
|
|
@ -23,7 +23,7 @@ numactl \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
/usr/bin/{{ container_binary }} run \
|
/usr/bin/{{ container_binary }} run \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--rm \
|
--rm \
|
||||||
--net=host \
|
--net=host \
|
||||||
|
|
|
@ -18,7 +18,7 @@ ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
|
||||||
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 \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v "{{ alertmanager_conf_dir }}:/etc/alertmanager:Z" \
|
-v "{{ alertmanager_conf_dir }}:/etc/alertmanager:Z" \
|
||||||
-v "{{ alertmanager_data_dir }}:/alertmanager:Z" \
|
-v "{{ alertmanager_data_dir }}:/alertmanager:Z" \
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
|
||||||
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 \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-v "{{ prometheus_conf_dir }}:/etc/prometheus:Z" \
|
-v "{{ prometheus_conf_dir }}:/etc/prometheus:Z" \
|
||||||
-v "{{ prometheus_data_dir }}:/prometheus:Z" \
|
-v "{{ prometheus_data_dir }}:/prometheus:Z" \
|
||||||
|
|
|
@ -17,7 +17,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rbd-mirror-{{ ansible_ho
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-rbd-mirror-{{ ansible_hostname }}
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-rbd-mirror-{{ ansible_hostname }}
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_rbd_mirror_docker_memory_limit }} \
|
--memory={{ ceph_rbd_mirror_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
|
@ -18,7 +18,7 @@ ExecStartPre=-/usr/bin/{{ container_binary }} stop ceph-rgw-{{ ansible_hostname
|
||||||
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-rgw-{{ ansible_hostname }}-${INST_NAME}
|
ExecStartPre=-/usr/bin/{{ container_binary }} rm ceph-rgw-{{ ansible_hostname }}-${INST_NAME}
|
||||||
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
ExecStart=/usr/bin/{{ container_binary }} run --rm --net=host \
|
||||||
{% if container_binary == 'podman' %}
|
{% if container_binary == 'podman' %}
|
||||||
-d --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
-d --log-driver journald --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid \
|
||||||
{% endif %}
|
{% endif %}
|
||||||
--memory={{ ceph_rgw_docker_memory_limit }} \
|
--memory={{ ceph_rgw_docker_memory_limit }} \
|
||||||
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
{% if (container_binary == 'docker' and ceph_docker_version.split('.')[0] is version('13', '>=')) or container_binary == 'podman' -%}
|
||||||
|
|
Loading…
Reference in New Issue