Move devel_packages out of defaults

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 e8fc34822bce945234e3a4994e13df84fd0a99a5..55e68a49a5fa463a0e0e63bf9c837cc81dbf2d47 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -17,3 +17,18 @@ defaults:
     plugins:
       - vonage-status-panel
       - grafana-piechart-panel
+devel_packages:
+  yum:
+    # unzip is needed to extract the Vonage plugin
+    - unzip
+    - grafana
+    # for dashUpdater.py
+    - PyYAML
+    - python-requests
+  apt:
+    # unzip is needed to extract the Vonage plugin
+    - unzip
+    - grafana
+    # for dashUpdater.py
+    - python-yaml
+    - python-requests

diff --git a/ansible/roles/ceph-graphite/defaults/main.yml b/ansible/roles/ceph-graphite/defaults/main.yml
index d1511b46f416939c3f1ff4955836da9299ff2b25..9a722b73011850b7eb6ef3cf7c9d205864997bc1 100644 (file)
--- a/ansible/roles/ceph-graphite/defaults/main.yml
+++ b/ansible/roles/ceph-graphite/defaults/main.yml
@@ -1,11 +1,10 @@
 ---
-defaults:
-  devel_packages:
-    yum:
-      - graphite-web
-      - python-carbon
-    apt:
-      - graphite-web
-      - apache2
-      - libapache2-mod-wsgi
-      - graphite-carbon
+devel_packages:
+  yum:
+    - graphite-web
+    - python-carbon
+  apt:
+    - graphite-web
+    - apache2
+    - libapache2-mod-wsgi
+    - graphite-carbon

diff --git a/ansible/roles/cephmetrics-common/defaults/main.yml b/ansible/roles/cephmetrics-common/defaults/main.yml
index 1c0469b0dd2a04505961f99c0309dd92c372dad6..57244d90f0291357179c7252c458e876a5dcb939 100644 (file)
--- a/ansible/roles/cephmetrics-common/defaults/main.yml
+++ b/ansible/roles/cephmetrics-common/defaults/main.yml
@@ -43,18 +43,3 @@ defaults:
       - ['15m', '5y']
   # The firewalld zone that carbon and grafana will use
   firewalld_zone: public
-  devel_packages:
-    yum:
-      # unzip is needed to extract the Vonage plugin
-      - unzip
-      - grafana
-      # for dashUpdater.py
-      - PyYAML
-      - python-requests
-    apt:
-      # unzip is needed to extract the Vonage plugin
-      - unzip
-      - grafana
-      # for dashUpdater.py
-      - python-yaml
-      - python-requests