From 3ecc9dc5e13981784608fdc2105be7a557c2e5f5 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 9 Oct 2015 11:26:45 -0400
Subject: [PATCH] Fixes after first round of testing

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/init.pp           | 17 +++++++++++++----
 templates/grafyaml.conf.erb |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 templates/grafyaml.conf.erb

diff --git a/manifests/init.pp b/manifests/init.pp
index 1d5b86b..0c99432 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,8 +8,10 @@
 #   Explanation of what this parameter affects and what it defaults to.
 #
 class grafyaml (
+  $config_dir = '',
   $git_revision = 'master',
   $git_source = 'https://git.openstack.org/openstack-infra/grafyaml',
+  $grafana_url = 'http://localhost:8080',
 ) {
   include ::pip
 
@@ -41,15 +43,22 @@ class grafyaml (
     force   => true,
     source  => $config_dir,
     require => File['/etc/grafyaml'],
-    notify  => Exec['grafana_dashboards_update'],
+    notify  => Exec['grafana_dashboard_update'],
   }
 
-  exec { 'grafana_dashboards_update':
-    command     => 'grafana-dashboards update /etc/grafyaml/config',
+  file { '/etc/grafyaml/grafyaml.conf':
+    ensure  => present,
+    content => template('grafyaml/grafyaml.conf.erb'),
+    mode    => '0400',
+    require => File['/etc/grafyaml'],
+  }
+
+  exec { 'grafana_dashboard_update':
+    command     => 'grafana-dashboard --config-file /etc/grafyaml/grafyaml.conf update /etc/grafyaml/config',
     path        => '/bin:/usr/bin:/usr/local/bin',
     refreshonly => true,
     require     => [
-      Package['python-grafyaml'],
+      Exec['install_grafyaml'],
     ],
   }
 }
diff --git a/templates/grafyaml.conf.erb b/templates/grafyaml.conf.erb
new file mode 100644
index 0000000..54ab2ab
--- /dev/null
+++ b/templates/grafyaml.conf.erb
@@ -0,0 +1,2 @@
+[grafana]
+url = <%= @grafana_url %>