From 59cc580b69fefbd83d069f255feb89ad1176edb9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 31 Jul 2015 13:33:06 -0400
Subject: [PATCH] Remove local grafana database

We'll be using trove for our database, as such we don't need to spin
up a local database.

Change-Id: I0768915cbed4d018f4d0ce3a86072bcf05e32cb9
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 manifests/site.pp                             | 15 +++++++-------
 .../openstack_project/manifests/grafana.pp    | 20 +------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index 75b8a0b11e..7560d3356f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -123,14 +123,13 @@ node 'grafana.openstack.org' {
     sysadmins                 => hiera('sysadmins', []),
   }
   class { 'openstack_project::grafana':
-    admin_password      => hiera('grafana_admin_password', 'XXX'),
-    admin_user          => hiera('grafana_admin_user', 'username'),
-    mysql_host          => hiera('grafana_mysql_host', 'localhost'),
-    mysql_name          => hiera('grafana_mysql_name', 'XXX'),
-    mysql_password      => hiera('grafana_mysql_password', 'XXX'),
-    mysql_root_password => hiera('grafana_mysql_root_password', 'XXX'),
-    mysql_user          => hiera('grafana_mysql_user', 'username'),
-    secret_key          => hiera('grafana_secret_key', 'XXX'),
+    admin_password => hiera('grafana_admin_password', 'XXX'),
+    admin_user     => hiera('grafana_admin_user', 'username'),
+    mysql_host     => hiera('grafana_mysql_host', 'localhost'),
+    mysql_name     => hiera('grafana_mysql_name', 'XXX'),
+    mysql_password => hiera('grafana_mysql_password', 'XXX'),
+    mysql_user     => hiera('grafana_mysql_user', 'username'),
+    secret_key     => hiera('grafana_secret_key', 'XXX'),
   }
 }
 
diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index da4e6d4b44..28c2818b9a 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -7,7 +7,6 @@
 #
 class openstack_project::grafana (
   $mysql_password,
-  $mysql_root_password,
   $admin_password = '',
   $admin_user = 'admin',
   $grafana_cfg = {},
@@ -51,25 +50,8 @@ class openstack_project::grafana (
 
   $grafana_cfg_merged = merge($grafana_cfg_defaults, $grafana_cfg)
 
-  class { 'mysql::server':
-    config_hash => {
-      'bind_address'   => $mysql_host,
-      'default_engine' => 'InnoDB',
-      'root_password'  => $mysql_root_password,
-    }
-  }
-
-  mysql::db { $mysql_name:
-    grant    => ['all'],
-    host     => $mysql_host,
-    password => $mysql_password,
-    user     => $mysql_user,
-    require  => Class['mysql::server'],
-  }
-
   class { '::grafana':
-    cfg     => $grafana_cfg_merged,
-    require => Mysql::Db[$mysql_name],
+    cfg => $grafana_cfg_merged,
   }
 
   apache::vhost { $vhost_name: