From a3f77f04415acd74baaee1a7a4fc48e6881e5a9e Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Fri, 16 Oct 2015 14:07:48 -0700 Subject: [PATCH] Remove placeholder hiera defaults Now that the apply tests no longer require default values for all hiera calls, remove the placeholder 'XXX' default values from grafana. Change-Id: I4e774e68916b7fd63b4ea4cfdc98a5ed87585d2f --- manifests/site.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index fc3126255a..e96fd2284f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -123,14 +123,14 @@ node 'grafana.openstack.org' { sysadmins => hiera('sysadmins', []), } class { 'openstack_project::grafana': - admin_password => hiera('grafana_admin_password', 'XXX'), + admin_password => hiera('grafana_admin_password'), 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_name => hiera('grafana_mysql_name'), + mysql_password => hiera('grafana_mysql_password'), mysql_user => hiera('grafana_mysql_user', 'username'), project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', - secret_key => hiera('grafana_secret_key', 'XXX'), + secret_key => hiera('grafana_secret_key'), } }