diff --git a/manifests/config.pp b/manifests/config.pp index f74b9ddc..7df1192d 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -26,7 +26,7 @@ class octavia::config ( include ::octavia::deps - validate_hash($octavia_config) + validate_legacy(Hash, 'validate_hash', $octavia_config) create_resources('octavia_config', $octavia_config) } diff --git a/manifests/db.pp b/manifests/db.pp index 3fb8201c..c747f223 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -66,9 +66,8 @@ class octavia::db ( $database_pool_timeout_real = pick($::octavia::database_pool_timeout, $database_pool_timeout) $database_db_max_retries_real = pick($::octavia::database_db_max_retries, $database_db_max_retries) - - 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 { 'octavia_config': connection => $database_connection_real, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index c953ad8d..4bab1722 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class octavia::db::mysql( include ::octavia::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql { 'octavia': user => $user, diff --git a/manifests/health_manager.pp b/manifests/health_manager.pp index 4cfa2620..6cd8bf65 100644 --- a/manifests/health_manager.pp +++ b/manifests/health_manager.pp @@ -46,7 +46,7 @@ class octavia::health_manager ( include ::octavia::deps - validate_string($heartbeat_key) + validate_legacy(String, 'validate_string', $heartbeat_key) package { 'octavia-health-manager': ensure => $package_ensure, diff --git a/manifests/policy.pp b/manifests/policy.pp index 7b448c75..635c7674 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class octavia::policy ( include ::octavia::deps include ::octavia::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path, diff --git a/manifests/worker.pp b/manifests/worker.pp index b65dc134..b72e0e70 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -148,7 +148,7 @@ class octavia::worker ( set octavia::controller class before octavia::worker!') } - validate_hash($nova_flavor_config) + validate_legacy(Hash, 'validate_hash', $nova_flavor_config) if ! $::octavia::controller::amp_flavor_id_real { if $manage_nova_flavor {