replace validate_legacy with proper data types
the validate_legacy function is marked for deprecation in v9.0.0 from puppetlabs-stdlib. Change-Id: Ic6aff0a3cfd27a7c2f005656c7b1d5a2cb07a199
This commit is contained in:
Takashi Kajinami
parent
40f1403bbc
commit
6adf5af558
|
|
@ -261,17 +261,13 @@ class ec2api::api (
|
|||
$bindir = $facts['os_service_default'],
|
||||
$state_path = $facts['os_service_default'],
|
||||
# Manage service
|
||||
$manage_service = true,
|
||||
$service_name = $::ec2api::params::api_service_name,
|
||||
$enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
String[1] $service_name = $::ec2api::params::api_service_name,
|
||||
Boolean $enabled = true,
|
||||
) inherits ec2api::params {
|
||||
|
||||
include ec2api::deps
|
||||
|
||||
validate_legacy(Boolean, 'validate_bool', $manage_service)
|
||||
validate_legacy(String, 'validate_string', $service_name)
|
||||
validate_legacy(Boolean, 'validate_bool', $enabled)
|
||||
|
||||
ec2api_config {
|
||||
'DEFAULT/keystone_ec2_tokens_url': value => $keystone_ec2_tokens_url;
|
||||
'DEFAULT/ec2_timestamp_expiry': value => $ec2_timestamp_expiry;
|
||||
|
|
|
|||
|
|
@ -24,15 +24,12 @@
|
|||
# or Puppet catalog compilation will fail with duplicate resources.
|
||||
#
|
||||
class ec2api::config (
|
||||
$ec2api_config = {},
|
||||
$ec2api_api_paste_ini = {},
|
||||
Hash $ec2api_config = {},
|
||||
Hash $ec2api_api_paste_ini = {},
|
||||
) {
|
||||
|
||||
include ec2api::deps
|
||||
|
||||
validate_legacy(Hash, 'validate_hash', $ec2api_config)
|
||||
validate_legacy(Hash, 'validate_hash', $ec2api_api_paste_ini)
|
||||
|
||||
create_resources('ec2api_config', $ec2api_config)
|
||||
create_resources('ec2api_api_paste_ini', $ec2api_api_paste_ini)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,24 +34,17 @@
|
|||
# Defaults to 'utf8_general_ci'
|
||||
#
|
||||
class ec2api::db::mysql (
|
||||
$password,
|
||||
$user = 'ec2api',
|
||||
$dbname = 'ec2api',
|
||||
$host = '127.0.0.1',
|
||||
$charset = 'utf8',
|
||||
$collate = 'utf8_general_ci',
|
||||
$allowed_hosts = undef
|
||||
String[1] $password,
|
||||
String[1] $user = 'ec2api',
|
||||
String[1] $dbname = 'ec2api',
|
||||
String[1] $host = '127.0.0.1',
|
||||
String[1] $charset = 'utf8',
|
||||
String[1] $collate = 'utf8_general_ci',
|
||||
$allowed_hosts = undef
|
||||
) {
|
||||
|
||||
include ec2api::deps
|
||||
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
validate_legacy(String, 'validate_string', $dbname)
|
||||
validate_legacy(String, 'validate_string', $user)
|
||||
validate_legacy(String, 'validate_string', $host)
|
||||
validate_legacy(String, 'validate_string', $charset)
|
||||
validate_legacy(String, 'validate_string', $collate)
|
||||
|
||||
::openstacklib::db::mysql { 'ec2api':
|
||||
user => $user,
|
||||
password => $password,
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@
|
|||
# Defaults to false.
|
||||
#
|
||||
class ec2api (
|
||||
$package_ensure = 'present',
|
||||
$package_manage = true,
|
||||
$package_name = $::ec2api::params::package_name,
|
||||
$package_provider = undef,
|
||||
$purge_config = false,
|
||||
String $package_ensure = 'present',
|
||||
Boolean $package_manage = true,
|
||||
String[1] $package_name = $::ec2api::params::package_name,
|
||||
$package_provider = undef,
|
||||
$purge_config = false,
|
||||
) inherits ec2api::params {
|
||||
|
||||
include ec2api::deps
|
||||
|
|
@ -37,10 +37,6 @@ class ec2api (
|
|||
include ec2api::policy
|
||||
include ec2api::db
|
||||
|
||||
validate_legacy(String, 'validate_string', $package_ensure)
|
||||
validate_legacy(Boolean, 'validate_bool', $package_manage)
|
||||
validate_legacy(String, 'validate_string', $package_name)
|
||||
|
||||
if $package_manage {
|
||||
package { 'ec2api' :
|
||||
ensure => $package_ensure,
|
||||
|
|
|
|||
|
|
@ -92,16 +92,13 @@ class ec2api::metadata (
|
|||
$metadata_use_ssl = $facts['os_service_default'],
|
||||
$metadata_workers = $facts['os_workers'],
|
||||
# Manage service
|
||||
$manage_service = true,
|
||||
$service_name = $::ec2api::params::metadata_service_name,
|
||||
$enabled = true,
|
||||
Boolean $manage_service = true,
|
||||
String[1] $service_name = $::ec2api::params::metadata_service_name,
|
||||
Boolean $enabled = true,
|
||||
) inherits ec2api::params {
|
||||
|
||||
include ec2api::deps
|
||||
|
||||
validate_legacy(Boolean, 'validate_bool', $manage_service)
|
||||
validate_legacy(String, 'validate_string', $service_name)
|
||||
validate_legacy(Boolean, 'validate_bool', $enabled)
|
||||
|
||||
ec2api_config {
|
||||
'metadata/nova_metadata_ip': value => $nova_metadata_ip;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
class ec2api::policy (
|
||||
$enforce_scope = $facts['os_service_default'],
|
||||
$enforce_new_defaults = $facts['os_service_default'],
|
||||
$policies = {},
|
||||
Hash $policies = {},
|
||||
$policy_path = '/etc/ec2api/policy.yaml',
|
||||
$policy_default_rule = $facts['os_service_default'],
|
||||
$policy_dirs = $facts['os_service_default'],
|
||||
|
|
@ -58,8 +58,6 @@ class ec2api::policy (
|
|||
include ec2api::deps
|
||||
include ec2api::params
|
||||
|
||||
validate_legacy(Hash, 'validate_hash', $policies)
|
||||
|
||||
$policy_parameters = {
|
||||
policies => $policies,
|
||||
policy_path => $policy_path,
|
||||
|
|
|
|||
Loading…
Reference in New Issue