diff --git a/manifests/config.pp b/manifests/config.pp index 4769fba..bef4c28 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -21,12 +21,10 @@ # or Puppet catalog compilation will fail with duplicate resources. # class zaqar::config ( - $zaqar_config = {}, + Hash $zaqar_config = {}, ) { include zaqar::deps - validate_legacy(Hash, 'validate_hash', $zaqar_config) - create_resources('zaqar_config', $zaqar_config) } diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 51acf46..368b988 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -34,7 +34,7 @@ # Defaults to 'utf8_general_ci' # class zaqar::db::mysql( - $password, + String[1] $password, $dbname = 'zaqar', $user = 'zaqar', $host = '127.0.0.1', @@ -45,8 +45,6 @@ class zaqar::db::mysql( include zaqar::deps - validate_legacy(String, 'validate_string', $password) - ::openstacklib::db::mysql { 'zaqar': user => $user, password => $password, diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index b61ac17..fe58a81 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -76,7 +76,7 @@ # Defaults to true # class zaqar::keystone::auth( - $password, + String[1] $password, $email = 'zaqar@localhost', $auth_name = 'zaqar', $service_name = 'zaqar', @@ -98,8 +98,6 @@ class zaqar::keystone::auth( include zaqar::deps - validate_legacy(String, 'validate_string', $password) - Keystone::Resource::Service_identity['zaqar'] -> Anchor['zaqar::service::end'] keystone::resource::service_identity { 'zaqar': diff --git a/manifests/policy.pp b/manifests/policy.pp index 9c8b035..692aead 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -48,7 +48,7 @@ class zaqar::policy ( $enforce_scope = $facts['os_service_default'], $enforce_new_defaults = $facts['os_service_default'], - $policies = {}, + Hash $policies = {}, $policy_path = '/etc/zaqar/policy.yaml', $policy_default_rule = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'], @@ -58,8 +58,6 @@ class zaqar::policy ( include zaqar::deps include zaqar::params - validate_legacy(Hash, 'validate_hash', $policies) - $policy_parameters = { policies => $policies, policy_path => $policy_path, diff --git a/manifests/server.pp b/manifests/server.pp index b1df91b..78d215b 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -21,9 +21,9 @@ # class zaqar::server( - $manage_service = true, - $enabled = true, - $service_name = $::zaqar::params::service_name, + Boolean $manage_service = true, + Boolean $enabled = true, + $service_name = $::zaqar::params::service_name, ) inherits zaqar::params { include zaqar @@ -31,9 +31,6 @@ class zaqar::server( include zaqar::params include zaqar::policy - validate_legacy(Boolean, 'validate_bool', $manage_service) - validate_legacy(Boolean, 'validate_bool', $enabled) - if $manage_service { if $enabled { $ensure = 'running' diff --git a/manifests/server_instance.pp b/manifests/server_instance.pp index 8f31cd7..ac62c0f 100644 --- a/manifests/server_instance.pp +++ b/manifests/server_instance.pp @@ -13,7 +13,7 @@ # define zaqar::server_instance( $transport, - $enabled = true, + Boolean $enabled = true, ) { if $name == 'zaqar' { @@ -24,8 +24,6 @@ define zaqar::server_instance( include zaqar::deps include zaqar::params - validate_legacy(Boolean, 'validate_bool', $enabled) - if $enabled { $service_ensure = 'running' } else {