From: Zack Cerza <zack@redhat.com>
Date: Thu, 2 Aug 2018 21:24:37 +0000 (-0700)
Subject: ceph-prometheus: Optionally add /etc/hosts entries
X-Git-Tag: v2.0~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=055f4d9ad4031b2cb612aada74f933dedf79ad74;p=cephmetrics.git

ceph-prometheus: Optionally add /etc/hosts entries

This only supports containerized deployments.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/ansible/roles/ceph-prometheus/defaults/main.yml b/ansible/roles/ceph-prometheus/defaults/main.yml
index 72d1b51..442d827 100644
--- a/ansible/roles/ceph-prometheus/defaults/main.yml
+++ b/ansible/roles/ceph-prometheus/defaults/main.yml
@@ -6,6 +6,9 @@ defaults:
     container_cpu_cores: 2
     # container_memory is in GB
     container_memory: 4
+    # This is passed directly to the docker_container module. It is only used
+    # for containerized deployments.
+    etc_hosts: {}
     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 9058c78..d87c3e5 100644
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -18,6 +18,7 @@
       - "{{ prometheus.data_dir }}:/prometheus:Z"
     networks:
       - name: "{{ docker.network_name }}"
+    etc_hosts: "{{ prometheus.etc_hosts }}"
     user: "{{ prometheus.user_id }}"
     keep_volumes: true
     pull: true