From 0592f4cf1eda81436005dd77a47c7960ef505aa9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 1 May 2017 15:34:28 -0400
Subject: [PATCH] Add Gemfile

Now that we have switched to gem-based puppet, we also need to include
our Gemfile for our spec helper. This should pull in the required
dependencies.

Properly quote configuration options for grafana.pp to pass lint
checks now.

Change-Id: Id85b14167416bc616a6f99cea43aacb53c2605b5
Depends-On: I082ea72743634b8ce0106786ab4ec35add874c8d
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 Gemfile                                       |  9 +++++++
 .../openstack_project/manifests/grafana.pp    | 24 +++++++++----------
 2 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 Gemfile

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000..e350f810c5
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+group :development, :test, :system_tests do
+  gem 'puppet-openstack_infra_spec_helper',
+      :git     => 'https://git.openstack.org/openstack-infra/puppet-openstack_infra_spec_helper',
+      :require => false
+end
+
+# vim:ft=ruby
diff --git a/modules/openstack_project/manifests/grafana.pp b/modules/openstack_project/manifests/grafana.pp
index 53df892702..2f24503209 100644
--- a/modules/openstack_project/manifests/grafana.pp
+++ b/modules/openstack_project/manifests/grafana.pp
@@ -28,26 +28,26 @@ class openstack_project::grafana (
       'reporting_enabled' => false,
     },
     'auth.anonymous' => {
-      enabled => true,
+      'enabled' => true,
     },
     'database' => {
-      type     => 'mysql',
-      host     => "${mysql_host}:3306",
-      name     => $mysql_name,
-      user     => $mysql_user,
-      password => $mysql_password,
+      'type'     => 'mysql',
+      'host'     => "${mysql_host}:3306",
+      'name'     => $mysql_name,
+      'user'     => $mysql_user,
+      'password' => $mysql_password,
     },
     'security' => {
-      admin_password => $admin_password,
-      admin_user     => $admin_user,
-      secret_key     => $secret_key,
+      'admin_password' => $admin_password,
+      'admin_user'     => $admin_user,
+      'secret_key'     => $secret_key,
     },
     'server'   => {
-      http_addr => $http_host,
-      http_port => $http_port,
+      'http_addr' => $http_host,
+      'http_port' => $http_port,
     },
     'users'    => {
-      allow_sign_up => false,
+      'allow_sign_up' => false,
     },
   }