From 569448c0a6380140b328b1266deaaebb78d67ccf Mon Sep 17 00:00:00 2001 From: Wolf Noble Date: Fri, 3 May 2013 17:00:52 -0500 Subject: [PATCH 1/2] Fix missing python_package_name parameter --- manifests/init.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 87c9978..dfde650 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -38,10 +38,10 @@ # # [*port*] - The port mysql listens on # -# [*python_package_name*] - The name of the python mysql package to install -# # [*purge_conf_dir*] - Value fed to recurse and purge parameters of the /etc/mysql/conf.d resource # +# [*python_package_name*] - The name of the python mysql package to install +# # [*restart*] - Whether to restart mysqld (true/false) # # [*root_group*] - Use specified group for root-owned files @@ -69,6 +69,8 @@ # # [*ssl_cert*] - The location of the SSL Certificate to use # +# [*ssl_key*] - The SSL key to use +# # Actions: # # Requires: @@ -94,6 +96,7 @@ class mysql( $pidfile = $mysql::params::pidfile, $port = $mysql::params::port, $purge_conf_dir = $mysql::params::purge_conf_dir, + $python_package_name = $mysql::params::python_package_name, $restart = $mysql::params::restart, $root_group = $mysql::params::root_group, $root_password = $mysql::params::root_password, From cf78bea206096264c204018c2564e60b45b51fdd Mon Sep 17 00:00:00 2001 From: Wolf Noble Date: Fri, 3 May 2013 17:06:06 -0500 Subject: [PATCH 2/2] minor fix to alphabetization of package_ensure parameter --- manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index dfde650..0544858 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,10 +28,10 @@ # # [*old_root_password*] - Previous root user password, # -# [*package_name*] - legacy parameter used to specify the client package. Should not be used going forward -# # [*package_ensure*] - ensure value for packages. # +# [*package_name*] - legacy parameter used to specify the client package. Should not be used going forward +# # [*php_package_name*] - The name of the phpmysql package to install # # [*pidfile*] - The location mysql will expect the pidfile to be, and will put it when starting the service. @@ -90,8 +90,8 @@ class mysql( $log_error = $mysql::params::log_error, $manage_service = $mysql::params::manage_service, $old_root_password = $mysql::params::old_root_password, - $package_name = undef, $package_ensure = $mysql::params::package_ensure, + $package_name = undef, $php_package_name = $mysql::params::php_package_name, $pidfile = $mysql::params::pidfile, $port = $mysql::params::port,