Allow skipping image verification

For the prometheus and grafana containers, in some specific
circumstances it's desirable to skip verification of the container
image. Allow passing that value in via group_vars.

Resolves: rhbz#1636136
Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index ed5f5e5ac4958e16b08f43c499673d0f69ef61ea..6eb03f5b46e8a37b3691568051194a50700c5189 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -15,6 +15,7 @@ defaults:
     uid: 472
     datasource: Local
     pull_image: true
+    trust_image_content: false
     # 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 35d1f19538f88543a967d0d50ffd7c0631958c5f..24c3cb83159879a40e921656ae3fadf16c624130 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -40,6 +40,7 @@
       - name: "{{ docker.network_name }}"
     keep_volumes: true
     pull: "{{ grafana.pull_image }}"
+    trust_image_content: "{{ grafana.trust_image_content }}"
     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 f1692be9ed3413b8a2e9c38aeb483d652cdfb7a2..af63f8260c05d54bbd7823f45fac6f098737bf6a 100644 (file)
--- a/ansible/roles/ceph-prometheus/defaults/main.yml
+++ b/ansible/roles/ceph-prometheus/defaults/main.yml
@@ -10,6 +10,7 @@ defaults:
     # for containerized deployments.
     etc_hosts: {}
     pull_image: true
+    trust_image_content: false
     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 1c8d8e6a67fcec95f963956e87db46d1e51a2f06..f356b21eb8b0694dd1253cff46d1a053ef930437 100644 (file)
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -22,6 +22,7 @@
     user: "{{ prometheus.user_id }}"
     keep_volumes: true
     pull: "{{ prometheus.pull_image }}"
+    trust_image_content: "{{ prometheus.trust_image_content }}"
     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