diff --git a/manifests/config.pp b/manifests/config.pp index e49d0b6..31a0995 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -24,15 +24,12 @@ # or Puppet catalog compilation will fail with duplicate resources. # class cloudkitty::config ( - $cloudkitty_config = {}, - $cloudkitty_api_paste_ini = {}, + Hash $cloudkitty_config = {}, + Hash $cloudkitty_api_paste_ini = {}, ) { include cloudkitty::deps - validate_legacy(Hash, 'validate_hash', $cloudkitty_config) - validate_legacy(Hash, 'validate_hash', $cloudkitty_api_paste_ini) - create_resources('cloudkitty_config', $cloudkitty_config) create_resources('cloudkitty_api_paste_ini', $cloudkitty_api_paste_ini) } diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 6dd86aa..a01b290 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -34,7 +34,7 @@ # Defaults to 'utf8_general_ci' # class cloudkitty::db::mysql( - $password, + String[1] $password, $dbname = 'cloudkitty', $user = 'cloudkitty', $host = '127.0.0.1', @@ -45,8 +45,6 @@ class cloudkitty::db::mysql( include cloudkitty::deps - validate_legacy(String, 'validate_string', $password) - ::openstacklib::db::mysql { 'cloudkitty': user => $user, password => $password,