diff options
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 16904fe..cbb57e0 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,7 +18,11 @@ class mysql { } } -class mysql::server inherits mysql { +class mysql::server( + $rootpw => hiera('mysql::server::rootpw', '') +){ + include mysql + package { "mysql-server": ensure => installed, } @@ -31,8 +35,8 @@ class mysql::server inherits mysql { require => Package["mysql-server"], } - case $mysql_rootpw { - '': { fail("You need to define a mysql root password! Please set \$mysql_rootpw in your site.pp or host config") } + case $rootpw { + '': { fail("You need to define a mysql root password! Please set mysql::server::rootpw config") } } file { '/usr/local/sbin/setmysqlpass.sh': @@ -52,11 +56,10 @@ class mysql::server inherits mysql { mysql::cnf { "root": home => "/root", - passwd => $mysql_rootpw, + passwd => $rootpw, } define mysql::cnf($home, $passwd) { - $mysql_passwd = $passwd file { "$home/.my.cnf": content => template('mysql/my.cnf.erb'), require => Service['mysql'], |