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 0d9be3ba77f98685c66f798cb797b6a8a5a62768..4bea619879e38bcc55bb49208daff7beeaf5ded4 100644 (file)
--- 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 35b799cf045ccfd769c484215657e32196594481..0a4ac56f016ef49d0fd954317a7fce539c96064f 100644 (file)
--- 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 8b17c6a11eaf87cc11ba5a5d33c7eb101d095c23..ff61dfd9ac93958b879b82b45ff2d67271c112e1 100644 (file)
--- 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 cbb3e7c71ae460eede8553a1d4c9f19d4ac0cd94..6d341f5978742fa233019d214629cd9a2c1ad370 100644 (file)
--- 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 9ce4acec0e60ec5fca1a3767bff8fc21abdf4221..d8107e2b245b0ee76b6c667a7a4a6d72c4fb3e3a 100644 (file)
--- 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 15dbd6eecec6da0927dcd0d4a4cd531fd00ec888..6e0cbe93020f11cc2869b69e1079308ccac3f372 100644 (file)
--- 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 8a9a572c8cbc76c915e4baa3b627c7b73ec5e7a6..0f5761b241ab848807af11d61a2cd5a082cb1455 100644 (file)
--- 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 11870000ffee192be4128a1135d2f721be5e96a7..c091c28e6a81fa1f6b29b2854e5420385cd9ed8f 100644 (file)
--- 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 7e6811620652ddd2792a3da08364ccd9aecc4169..228b95c5801310dc7a79197a0c39ce0d26c01fd6 100644 (file)
--- 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 57244d90f0291357179c7252c458e876a5dcb939..0f2287d1dc6cc0190730bd845e252ffead403954 100644 (file)
--- 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