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>
This commit is contained in:
Paul Belanger 2017-05-01 15:34:28 -04:00
parent dc0cf8acbb
commit 0592f4cf1e
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 21 additions and 12 deletions

9
Gemfile Normal file
View File

@ -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

View File

@ -28,26 +28,26 @@ class openstack_project::grafana (
'reporting_enabled' => false, 'reporting_enabled' => false,
}, },
'auth.anonymous' => { 'auth.anonymous' => {
enabled => true, 'enabled' => true,
}, },
'database' => { 'database' => {
type => 'mysql', 'type' => 'mysql',
host => "${mysql_host}:3306", 'host' => "${mysql_host}:3306",
name => $mysql_name, 'name' => $mysql_name,
user => $mysql_user, 'user' => $mysql_user,
password => $mysql_password, 'password' => $mysql_password,
}, },
'security' => { 'security' => {
admin_password => $admin_password, 'admin_password' => $admin_password,
admin_user => $admin_user, 'admin_user' => $admin_user,
secret_key => $secret_key, 'secret_key' => $secret_key,
}, },
'server' => { 'server' => {
http_addr => $http_host, 'http_addr' => $http_host,
http_port => $http_port, 'http_port' => $http_port,
}, },
'users' => { 'users' => {
allow_sign_up => false, 'allow_sign_up' => false,
}, },
} }