From: Boris Ranto <branto@redhat.com>
Date: Thu, 19 Apr 2018 19:12:08 +0000 (+0200)
Subject: Merge containerized variables
X-Git-Tag: v2.0~36^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3a292b2823a9e13f6ade29940aa127cc774aabb;p=cephmetrics.git

Merge containerized variables

This will also help us fix of accessing these variables in ceph-docker
role where they were not defined previously.

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/ansible/roles/ceph-docker/tasks/main.yml b/ansible/roles/ceph-docker/tasks/main.yml
index 0d9be3b..4bea619 100644
--- a/ansible/roles/ceph-docker/tasks/main.yml
+++ b/ansible/roles/ceph-docker/tasks/main.yml
@@ -6,8 +6,7 @@
 - name: End play if no containers are desired
   meta: end_play
   when:
-    - not grafana.containerized
-    - not prometheus.containerized
+    - not containerized
 
 - include: install_packages.yml
   tags:
diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index 35b799c..0a4ac56 100644
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -5,7 +5,6 @@ defaults:
   replace_dashboards: true
   update_alerts: false
   grafana:
-    containerized: false
     container_name: "grafana/grafana"
     # version currently only applies to containers
     version: 5.0.4
diff --git a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
index 8b17c6a..ff61dfd 100644
--- a/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
+++ b/ansible/roles/ceph-grafana/tasks/configure_grafana.yml
@@ -26,7 +26,7 @@
     owner: 104
     recurse: true
   when:
-    - grafana.containerized
+    - containerized
   tags: [ini]
 
 - name: Set domain in grafana.ini
@@ -49,7 +49,7 @@
 - include: grafana_plugins.yml
   when:
     - devel_mode
-    - not grafana.containerized
+    - not containerized
 
 - name: Enable and start grafana
   service:
@@ -130,7 +130,7 @@
 
 - include: push_dashboards_dashupdater.yml
   when:
-    - not grafana.containerized
+    - not containerized
     - backend.metrics == "cephmetrics"
     - backend.storage == "graphite"
   tags:
diff --git a/ansible/roles/ceph-grafana/tasks/main.yml b/ansible/roles/ceph-grafana/tasks/main.yml
index cbb3e7c..6d341f5 100644
--- a/ansible/roles/ceph-grafana/tasks/main.yml
+++ b/ansible/roles/ceph-grafana/tasks/main.yml
@@ -9,17 +9,17 @@
 
 - include: setup_container.yml
   when:
-    - grafana.containerized
+    - containerized
 
 - include: setup_repos.yml
   when:
-    - not grafana.containerized
+    - not containerized
   tags:
     - packages
     - repos
 
 - include: install_packages.yml
-  when: not grafana.containerized
+  when: not containerized
   tags:
     - packages
 
diff --git a/ansible/roles/ceph-grafana/tasks/setup_container.yml b/ansible/roles/ceph-grafana/tasks/setup_container.yml
index 9ce4ace..d8107e2 100644
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -3,7 +3,7 @@
   include_role:
     name: ceph-docker
     allow_duplicates: false
-  when: grafana.containerized
+  when: containerized
   tags: docker
 
 - name: Create grafana user
diff --git a/ansible/roles/ceph-prometheus/defaults/main.yml b/ansible/roles/ceph-prometheus/defaults/main.yml
index 15dbd6e..6e0cbe9 100644
--- a/ansible/roles/ceph-prometheus/defaults/main.yml
+++ b/ansible/roles/ceph-prometheus/defaults/main.yml
@@ -1,7 +1,6 @@
 ---
 defaults:
   prometheus:
-    containerized: false
     container_name: prom/prometheus
     version: latest
     data_dir: /var/lib/cephmetrics
diff --git a/ansible/roles/ceph-prometheus/tasks/main.yml b/ansible/roles/ceph-prometheus/tasks/main.yml
index 8a9a572..0f5761b 100644
--- a/ansible/roles/ceph-prometheus/tasks/main.yml
+++ b/ansible/roles/ceph-prometheus/tasks/main.yml
@@ -25,7 +25,7 @@
   notify: Service handler
 
 - include: setup_container.yml
-  when: prometheus.containerized
+  when: containerized
 
 - name: Ship systemd service
   copy:
diff --git a/ansible/roles/ceph-prometheus/tasks/sanity.yml b/ansible/roles/ceph-prometheus/tasks/sanity.yml
index 1187000..c091c28 100644
--- a/ansible/roles/ceph-prometheus/tasks/sanity.yml
+++ b/ansible/roles/ceph-prometheus/tasks/sanity.yml
@@ -1,5 +1,5 @@
 ---
-- name: Fail when prometheus.containerized is False
+- name: Fail when containerized is False
   fail:
     msg: "This role only supports a containerized deployment at this time"
-  when: not prometheus.containerized
+  when: not containerized
diff --git a/ansible/roles/ceph-prometheus/tasks/setup_container.yml b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
index 7e68116..228b95c 100644
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -3,7 +3,7 @@
   include_role:
     name: ceph-docker
     allow_duplicates: false
-  when: prometheus.containerized
+  when: containerized
   tags: docker
 
 - name: Start docker container
diff --git a/ansible/roles/cephmetrics-common/defaults/main.yml b/ansible/roles/cephmetrics-common/defaults/main.yml
index 57244d9..0f2287d 100644
--- a/ansible/roles/cephmetrics-common/defaults/main.yml
+++ b/ansible/roles/cephmetrics-common/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 defaults:
+  containerized: false
   backend:
     metrics: mgr  # mgr, cephmetrics
     storage: prometheus  # prometheus, graphite