Prevent pull images for prometheus and grafana

This patch add a new prometheus and grafana variable to allow install when the images already pulled on docker.

Signed-off-by: Marcos Amorim <mamorim@redhat.com>

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index cd454d6b0be051de80879792be1584ad9479a370..95227cdb453f81852a0ca565117f9957a1417031 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -14,6 +14,7 @@ defaults:
     version: latest
     uid: 472
     datasource: Local
+    pull_image: true
     # You need to change these in the web UI on an already deployed machine, first
     # New deployments work fine
     admin_user: admin

diff --git a/ansible/roles/ceph-grafana/tasks/setup_container.yml b/ansible/roles/ceph-grafana/tasks/setup_container.yml
index 966d38f36381872f7d958a950ae9d17084be7f6c..35d1f19538f88543a967d0d50ffd7c0631958c5f 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -39,7 +39,7 @@
     networks:
       - name: "{{ docker.network_name }}"
     keep_volumes: true
-    pull: true
+    pull: "{{ grafana.pull_image }}"
     cpu_period: "{{ grafana.container_cpu_period }}"
     # As of ansible-2.5.2, this module doesn't support the equivalent of the
     # --cpus flag, so we must use period/quota for now

diff --git a/ansible/roles/ceph-prometheus/defaults/main.yml b/ansible/roles/ceph-prometheus/defaults/main.yml
index 442d82722d1f61587ba4fff7ed72c41f84ea1e4f..f1692be9ed3413b8a2e9c38aeb483d652cdfb7a2 100644 (file)
--- a/ansible/roles/ceph-prometheus/defaults/main.yml
+++ b/ansible/roles/ceph-prometheus/defaults/main.yml
@@ -9,6 +9,7 @@ defaults:
     # This is passed directly to the docker_container module. It is only used
     # for containerized deployments.
     etc_hosts: {}
+    pull_image: true
     version: latest
     data_dir: /var/lib/cephmetrics
     user_id: '65534'  # This is the UID used by the prom/prometheus docker image

diff --git a/ansible/roles/ceph-prometheus/tasks/setup_container.yml b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
index d87c3e50a5d7d29181dcaf163c61bcf44fcc34f0..1c8d8e6a67fcec95f963956e87db46d1e51a2f06 100644 (file)
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -21,7 +21,7 @@
     etc_hosts: "{{ prometheus.etc_hosts }}"
     user: "{{ prometheus.user_id }}"
     keep_volumes: true
-    pull: true
+    pull: "{{ prometheus.pull_image }}"
     cpu_period: "{{ prometheus.container_cpu_period }}"
     # As of ansible-2.5.2, this module doesn't support the equivalent of the
     # --cpus flag, so we must use period/quota for now