Merge "Use validate_legacy"
This commit is contained in:
commit
e968b0b8cc
|
@ -30,8 +30,8 @@ class heat::config (
|
|||
|
||||
include ::heat::deps
|
||||
|
||||
validate_hash($heat_config)
|
||||
validate_hash($heat_api_paste_ini)
|
||||
validate_legacy(Hash, 'validate_hash', $heat_config)
|
||||
validate_legacy(Hash, 'validate_hash', $heat_api_paste_ini)
|
||||
|
||||
create_resources('heat_config', $heat_config)
|
||||
create_resources('heat_api_paste_ini', $heat_api_paste_ini)
|
||||
|
|
|
@ -72,8 +72,8 @@ class heat::db (
|
|||
$database_max_overflow_real = pick($::heat::database_max_overflow, $database_max_overflow)
|
||||
$sync_db_real = pick($::heat::sync_db, $sync_db)
|
||||
|
||||
validate_re($database_connection_real,
|
||||
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
|
||||
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
|
||||
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
|
||||
|
||||
oslo::db { 'heat_config':
|
||||
connection => $database_connection_real,
|
||||
|
|
|
@ -45,7 +45,7 @@ class heat::db::mysql(
|
|||
|
||||
include ::heat::deps
|
||||
|
||||
validate_string($password)
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
::openstacklib::db::mysql { 'heat':
|
||||
user => $user,
|
||||
|
|
|
@ -182,7 +182,8 @@ class heat::engine (
|
|||
# - if set, array validation will be done for not empty and then configure the parameter.
|
||||
# - Otherwise, fallback to default.
|
||||
if !is_service_default($plugin_dirs) and !empty($plugin_dirs) {
|
||||
validate_array($plugin_dirs)
|
||||
validate_legacy(Array, 'validate_array', $plugin_dirs)
|
||||
|
||||
$plugin_dirs_real = join($plugin_dirs, ',')
|
||||
} else {
|
||||
$plugin_dirs_real = $::os_service_default
|
||||
|
|
|
@ -411,11 +411,11 @@ class heat(
|
|||
}
|
||||
|
||||
if (!is_service_default($enable_stack_adopt)) {
|
||||
validate_bool($enable_stack_adopt)
|
||||
validate_legacy(Boolean, 'validate_bool', $enable_stack_adopt)
|
||||
}
|
||||
|
||||
if (!is_service_default($enable_stack_abandon)) {
|
||||
validate_bool($enable_stack_abandon)
|
||||
validate_legacy(Boolean, 'validate_bool', $enable_stack_abandon)
|
||||
}
|
||||
|
||||
heat_config {
|
||||
|
|
|
@ -120,7 +120,7 @@ class heat::keystone::auth (
|
|||
|
||||
include ::heat::deps
|
||||
|
||||
validate_string($password)
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
keystone::resource::service_identity { 'heat':
|
||||
configure_user => $configure_user,
|
||||
|
|
|
@ -90,7 +90,7 @@ class heat::keystone::auth_cfn (
|
|||
|
||||
include ::heat::deps
|
||||
|
||||
validate_string($password)
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
keystone::resource::service_identity { 'heat-cfn':
|
||||
configure_user => $configure_user,
|
||||
|
|
|
@ -31,7 +31,7 @@ class heat::policy (
|
|||
include ::heat::deps
|
||||
include ::heat::params
|
||||
|
||||
validate_hash($policies)
|
||||
validate_legacy(Hash, 'validate_hash', $policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
|
|
|
@ -122,7 +122,7 @@ class heat::wsgi::apache_api_cfn (
|
|||
include ::apache
|
||||
include ::apache::mod::headers
|
||||
|
||||
validate_integer($port)
|
||||
validate_legacy(Integer, 'validate_integer', $port)
|
||||
|
||||
# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1396553
|
||||
if $::osfamily == 'RedHat' and $port == 8000 and $::selinux {
|
||||
|
|
Loading…
Reference in New Issue