Merge "replace validate_legacy with proper data types"
This commit is contained in:
commit
bf8e2264e9
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue