From a41dd9992a5332a0e9972635e39d275daf41e550 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Tue, 13 Nov 2018 16:19:07 +0100
Subject: [PATCH] Improve container handling

Signed-off-by: Boris Ranto <branto@redhat.com>
---
 ansible/roles/ceph-grafana/tasks/setup_container.yml  |  7 +++++++
 .../ceph-node-exporter/tasks/setup_container.yml      | 11 +++++++++++
 .../roles/ceph-prometheus/tasks/setup_container.yml   | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/ansible/roles/ceph-grafana/tasks/setup_container.yml b/ansible/roles/ceph-grafana/tasks/setup_container.yml
index e217610..f39ba04 100644
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -22,6 +22,12 @@
     - /etc/grafana
     - /var/lib/grafana
 
+- name: Make sure the grafana-server service is down
+  service:
+    name: grafana-server
+    state: stopped
+  failed_when: false
+
 - name: Create docker container
   docker_container:
     name: grafana-server
@@ -30,6 +36,7 @@
     # restart to allow updates
     restart: true
     restart_policy: no
+    force_kill: yes
     published_ports: '3000:3000'
     detach: true
     volumes:
diff --git a/ansible/roles/ceph-node-exporter/tasks/setup_container.yml b/ansible/roles/ceph-node-exporter/tasks/setup_container.yml
index 025624d..19d5ff8 100644
--- a/ansible/roles/ceph-node-exporter/tasks/setup_container.yml
+++ b/ansible/roles/ceph-node-exporter/tasks/setup_container.yml
@@ -3,16 +3,27 @@
   include_role:
     name: ceph-docker
     allow_duplicates: false
+  when: containerized
+
+- name: Make sure the node_exporter service is down
+  service:
+    name: node_exporter
+    state: stopped
+  failed_when: false
 
 - name: Start docker container
   docker_container:
     name: node-exporter
     image: "{{ node_exporter.container_image }}"
+    state: started
     command:
       - '--path.procfs=/host/proc'
       - '--path.sysfs=/host/sys'
       - '--no-collector.timex'
+    # restart to allow updates
+    restart: true
     restart_policy: no
+    force_kill: yes
     detach: true
     volumes:
       - '/proc:/host/proc:ro'
diff --git a/ansible/roles/ceph-prometheus/tasks/setup_container.yml b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
index 3a5b195..2fc8a73 100644
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -5,12 +5,22 @@
     allow_duplicates: false
   when: containerized
 
+- name: Make sure the prometheus service is down
+  service:
+    name: prometheus
+    state: stopped
+  failed_when: false
+
 - name: Start docker container
   docker_container:
     name: prometheus
     image: "{{ prometheus.container_image }}"
+    state: started
     command: "--config.file=/prometheus/prometheus.yml"
+    # restart to allow updates
+    restart: true
     restart_policy: no
+    force_kill: yes
     published_ports: '9090:9090'
     detach: true
     volumes:
-- 
2.47.3