replace validate_legacy with proper data types
the validate_legacy function is marked for deprecation in v9.0.0 from puppetlabs-stdlib. This also adds validations about some boolean parameters. Change-Id: I8c614a9a98521b14f76385d0d2fca2a75395e774
This commit is contained in:
parent
06ec201207
commit
7156a9dde5
|
@ -41,8 +41,8 @@
|
|||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
class vitrage::api (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$package_ensure = 'present',
|
||||
$host = '0.0.0.0',
|
||||
$port = '8999',
|
||||
|
|
|
@ -24,15 +24,12 @@
|
|||
# or Puppet catalog compilation will fail with duplicate resources.
|
||||
#
|
||||
class vitrage::config (
|
||||
$vitrage_config = {},
|
||||
$vitrage_api_paste_ini = {},
|
||||
Hash $vitrage_config = {},
|
||||
Hash $vitrage_api_paste_ini = {},
|
||||
) {
|
||||
|
||||
include vitrage::deps
|
||||
|
||||
validate_legacy(Hash, 'validate_hash', $vitrage_config)
|
||||
validate_legacy(Hash, 'validate_hash', $vitrage_api_paste_ini)
|
||||
|
||||
create_resources('vitrage_config', $vitrage_config)
|
||||
create_resources('vitrage_api_paste_ini', $vitrage_api_paste_ini)
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
# Defaults to 'utf8_general_ci'
|
||||
#
|
||||
class vitrage::db::mysql(
|
||||
$password,
|
||||
String[1] $password,
|
||||
$dbname = 'vitrage',
|
||||
$user = 'vitrage',
|
||||
$host = '127.0.0.1',
|
||||
|
@ -45,8 +45,6 @@ class vitrage::db::mysql(
|
|||
|
||||
include vitrage::deps
|
||||
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
::openstacklib::db::mysql { 'vitrage':
|
||||
user => $user,
|
||||
password => $password,
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
# Defaults to 'present'
|
||||
#
|
||||
class vitrage::graph (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$package_ensure = 'present',
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$package_ensure = 'present',
|
||||
) {
|
||||
|
||||
include vitrage::deps
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
class vitrage::notifier (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$package_ensure = 'present',
|
||||
$notifiers = $facts['os_service_default'],
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$package_ensure = 'present',
|
||||
$notifiers = $facts['os_service_default'],
|
||||
) {
|
||||
|
||||
include vitrage::deps
|
||||
|
|
|
@ -14,9 +14,9 @@
|
|||
# Defaults to 'present'
|
||||
#
|
||||
class vitrage::persistor (
|
||||
$manage_service = true,
|
||||
$enabled = true,
|
||||
$package_ensure = 'present',
|
||||
Boolean $manage_service = true,
|
||||
Boolean $enabled = true,
|
||||
$package_ensure = 'present',
|
||||
) {
|
||||
|
||||
include vitrage::deps
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
class vitrage::policy (
|
||||
$enforce_scope = $facts['os_service_default'],
|
||||
$enforce_new_defaults = $facts['os_service_default'],
|
||||
$policies = {},
|
||||
Hash $policies = {},
|
||||
$policy_path = '/etc/vitrage/policy.yaml',
|
||||
$policy_default_rule = $facts['os_service_default'],
|
||||
$policy_dirs = $facts['os_service_default'],
|
||||
|
@ -58,8 +58,6 @@ class vitrage::policy (
|
|||
include vitrage::deps
|
||||
include vitrage::params
|
||||
|
||||
validate_legacy(Hash, 'validate_hash', $policies)
|
||||
|
||||
$policy_parameters = {
|
||||
policies => $policies,
|
||||
policy_path => $policy_path,
|
||||
|
|
Loading…
Reference in New Issue