From aa60e0e8b215285fa1bda2722493811ecd800a1c Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Thu, 12 Apr 2018 10:35:49 -0600
Subject: [PATCH] Move devel_packages out of defaults

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 ansible/roles/ceph-grafana/defaults/main.yml  | 15 +++++++++++++++
 ansible/roles/ceph-graphite/defaults/main.yml | 19 +++++++++----------
 .../cephmetrics-common/defaults/main.yml      | 15 ---------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index e8fc348..55e68a4 100644
--- 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 d1511b4..9a722b7 100644
--- 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 1c0469b..57244d9 100644
--- 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
-- 
2.47.3