diff --git a/manifests/api.pp b/manifests/api.pp index 141b8eb..18b1241 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -71,15 +71,15 @@ # class magnum::api( $package_ensure = 'present', - $enabled = true, - $manage_service = true, + Boolean $enabled = true, + Boolean $manage_service = true, $service_name = $::magnum::params::api_service, $port = '9511', $host = '127.0.0.1', $max_limit = '1000', - $sync_db = true, + Boolean $sync_db = true, $auth_strategy = 'keystone', - $enabled_ssl = false, + Boolean $enabled_ssl = false, $ssl_cert_file = $facts['os_service_default'], $ssl_key_file = $facts['os_service_default'], $workers = $facts['os_workers'], @@ -90,11 +90,6 @@ class magnum::api( include magnum::params include magnum::policy - validate_legacy(Boolean, 'validate_bool', $manage_service) - validate_legacy(Boolean, 'validate_bool', $enabled) - validate_legacy(Boolean, 'validate_bool', $sync_db) - validate_legacy(Boolean, 'validate_bool', $enabled_ssl) - if $enabled_ssl { if is_service_default($ssl_cert_file) { fail('The ssl_cert_file parameter is required when enabled_ssl is true') diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 457ac57..76f6738 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -30,8 +30,8 @@ # Defaults to $facts['os_workers'] # class magnum::conductor( - $enabled = true, - $manage_service = true, + Boolean $enabled = true, + Boolean $manage_service = true, $package_ensure = 'present', $conductor_life_check_timeout = $facts['os_service_default'], $auth_strategy = 'keystone', @@ -42,9 +42,6 @@ class magnum::conductor( include magnum::deps include magnum::params - validate_legacy(Boolean, 'validate_bool', $manage_service) - validate_legacy(Boolean, 'validate_bool', $enabled) - # Install package package { 'magnum-conductor': ensure => $package_ensure, diff --git a/manifests/config.pp b/manifests/config.pp index 88c8bda..44c18a2 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -24,15 +24,12 @@ # or Puppet catalog compilation will fail with duplicate resources. # class magnum::config ( - $magnum_config = {}, - $magnum_api_paste_ini = {}, + Hash $magnum_config = {}, + Hash $magnum_api_paste_ini = {}, ) { include magnum::deps - validate_legacy(Hash, 'validate_hash', $magnum_config) - validate_legacy(Hash, 'validate_hash', $magnum_api_paste_ini) - create_resources('magnum_config', $magnum_config) create_resources('magnum_api_paste_ini', $magnum_api_paste_ini) } diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 5140ec5..4b8d1ab 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -34,7 +34,7 @@ # Defaults to 'utf8_general_ci' # class magnum::db::mysql( - $password, + String[1] $password, $dbname = 'magnum', $user = 'magnum', $host = '127.0.0.1', @@ -45,8 +45,6 @@ class magnum::db::mysql( include magnum::deps - validate_legacy(String, 'validate_string', $password) - ::openstacklib::db::mysql { 'magnum': user => $user, password => $password, diff --git a/manifests/policy.pp b/manifests/policy.pp index a07f81e..b20093e 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -48,7 +48,7 @@ class magnum::policy ( $enforce_scope = $facts['os_service_default'], $enforce_new_defaults = $facts['os_service_default'], - $policies = {}, + Hash $policies = {}, $policy_path = '/etc/magnum/policy.yaml', $policy_default_rule = $facts['os_service_default'], $policy_dirs = $facts['os_service_default'], @@ -58,8 +58,6 @@ class magnum::policy ( include magnum::deps include magnum::params - validate_legacy(Hash, 'validate_hash', $policies) - $policy_parameters = { policies => $policies, policy_path => $policy_path,