From 52f9b4c5f709275a3bb97ccd106ca9ebc9a2bdea Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sat, 23 Feb 2019 23:23:09 +0100 Subject: [PATCH] Use validate_legacy This changes all the puppet 3 validate_* functions to use the validate_legacy function. The validate_legacy function has been available since about three years but require Puppet >= 4.4.0 and since there is Puppet 4.10.12 as latest we should assume people are running a fairly new Puppet 4 version. This is the first step to then remove all validate function calls and use proper types for parameter as described in spec [1]. [1] https://review.openstack.org/#/c/568929/ Change-Id: I4da049ff59fd71403f4d00cfad8c5f56041e1e6e --- manifests/config.pp | 8 ++++---- manifests/db.pp | 3 ++- manifests/db/mysql.pp | 2 +- manifests/db/mysql_cfapi.pp | 2 +- manifests/db/postgresql.pp | 2 +- manifests/db/postgresql_cfapi.pp | 2 +- manifests/db_cfapi.pp | 3 ++- manifests/init.pp | 2 +- manifests/policy.pp | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index d80258c..0a62197 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -38,10 +38,10 @@ class murano::config ( include ::murano::deps - validate_hash($murano_config) - validate_hash($murano_cfapi_config) - validate_hash($murano_paste_config) - validate_hash($murano_cfapi_paste_config) + validate_legacy(Hash, 'validate_hash', $murano_config) + validate_legacy(Hash, 'validate_hash', $murano_cfapi_config) + validate_legacy(Hash, 'validate_hash', $murano_paste_config) + validate_legacy(Hash, 'validate_hash', $murano_cfapi_paste_config) create_resources('murano_config', $murano_config) create_resources('murano_cfapi_config', $murano_cfapi_config) diff --git a/manifests/db.pp b/manifests/db.pp index 26df33b..f3dfef4 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -66,7 +66,8 @@ class murano::db ( $database_retry_interval_real = pick($::murano::database_retry_interval, $database_retry_interval) $database_max_overflow_real = pick($::murano::database_max_overflow, $database_max_overflow) - validate_re($database_connection_real, '^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') + validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real, + ['^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { 'murano_config': connection => $database_connection_real, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index d2dcd85..63039a6 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -44,7 +44,7 @@ class murano::db::mysql( include ::murano::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql{ 'murano': user => $user, diff --git a/manifests/db/mysql_cfapi.pp b/manifests/db/mysql_cfapi.pp index 7d1f3fc..91b3af7 100644 --- a/manifests/db/mysql_cfapi.pp +++ b/manifests/db/mysql_cfapi.pp @@ -44,7 +44,7 @@ class murano::db::mysql_cfapi( include ::murano::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql{ 'murano_cfapi': user => $user, diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 14ea78a..5e765ee 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -34,7 +34,7 @@ class murano::db::postgresql( include ::murano::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::postgresql { 'murano': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/postgresql_cfapi.pp b/manifests/db/postgresql_cfapi.pp index 0ccfab8..a6812ae 100644 --- a/manifests/db/postgresql_cfapi.pp +++ b/manifests/db/postgresql_cfapi.pp @@ -34,7 +34,7 @@ class murano::db::postgresql_cfapi( include ::murano::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::postgresql { 'murano_cfapi': password_hash => postgresql_password($user, $password), diff --git a/manifests/db_cfapi.pp b/manifests/db_cfapi.pp index 1e8eaa0..7d936c3 100644 --- a/manifests/db_cfapi.pp +++ b/manifests/db_cfapi.pp @@ -53,7 +53,8 @@ class murano::db_cfapi ( if !is_service_default($database_connection) { - validate_re($database_connection, '^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') + validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, + ['^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { 'murano_cfapi_config': connection => $database_connection, diff --git a/manifests/init.pp b/manifests/init.pp index 3bdf0f7..4238f9a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -310,7 +310,7 @@ class murano( include ::murano::policy include ::murano::db - validate_string($admin_password) + validate_legacy(String, 'validate_string', $admin_password) package { 'murano-common': ensure => $package_ensure, diff --git a/manifests/policy.pp b/manifests/policy.pp index a04e6b6..4ae60c2 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class murano::policy ( include ::murano::deps include ::murano::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,