Puppet update; adding storeconfig block

diff --git a/manifests/master.pp b/manifests/master.pp
index 3b021959f6050958a892272d7baacef58aa9f174..1c4abfa6d713b947b2589a6dd85670f16c7de43d 100644 (file)
--- a/manifests/master.pp
+++ b/manifests/master.pp
@@ -1,5 +1,6 @@
 class nodo::master {
-  $main_master = hiera('nodo::master::main', false)
+  $main_master        = hiera('nodo::master::main', false)
+  $master_db_password = hiera('nodo::master::db_password', '')
 
   if $main_master == true {
     # Puppetmaster should be included before nodo::vserver
@@ -40,13 +41,31 @@ class nodo::master {
     ensure => absent,
   }
 
-  case $puppetmaster_db_password {
-    '': { fail("Please set \$puppetmaster_db_password in your host config") }
+  # For storeconfigs
+  include mysql::server
+
+  # Database creation as suggested by
+  # http://reductivelabs.com/trac/puppet/wiki/Recipes/MySQLStoredConfiguration
+  #exec { "create-storeconfigs-db":
+  #    command => "/usr/bin/mysqladmin create puppet",
+  #    unless  => "/usr/bin/mysqlcheck -s puppet",
+  #    notify  => Exec["create-storeconfigs-user"],
+  #}
+  #
+  #$cmd = "/usr/bin/mysql -e 'grant all privileges on puppet.* to puppet@localhost identified by \"puppet\"'"
+  #
+  #exec { "create-storeconfigs-user":
+  #    command     => $cmd,
+  #    refreshonly => true,
+  #}
+
+  case $master_db_password {
+    '': { fail("Please set nodo::master::db_password in your config") }
   }
 
   # Update master's puppet.conf if you change here
   database::instance { "puppet":
-    password => "$puppetmaster_db_password",
+    password => "$db_password",
   }
 
   # Used for trac dependency graphs