openstack/puppet-octavia
Code Issues Proposed changes

Merge "Use validate_legacy"

Browse Source
This commit is contained in:
Zuul 2019-02-25 17:42:49 +00:00 committed by Gerrit Code Review
commit 6754d3d611
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/config.pp
View File

@ -26,7 +26,7 @@ class octavia::config (
include ::octavia::deps include ::octavia::deps
validate_hash($octavia_config) validate_legacy(Hash, 'validate_hash', $octavia_config)
create_resources('octavia_config', $octavia_config) create_resources('octavia_config', $octavia_config)
} }

5
manifests/db.pp
View File

@ -66,9 +66,8 @@ class octavia::db (
$database_pool_timeout_real = pick($::octavia::database_pool_timeout, $database_pool_timeout) $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) $database_db_max_retries_real = pick($::octavia::database_db_max_retries, $database_db_max_retries)
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
validate_re($database_connection_real, ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
oslo::db { 'octavia_config': oslo::db { 'octavia_config':
connection => $database_connection_real, connection => $database_connection_real,

2
manifests/db/mysql.pp
View File

@ -45,7 +45,7 @@ class octavia::db::mysql(
include ::octavia::deps include ::octavia::deps
validate_string($password) validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'octavia': ::openstacklib::db::mysql { 'octavia':
user => $user, user => $user,

2
manifests/health_manager.pp
View File

@ -46,7 +46,7 @@ class octavia::health_manager (
include ::octavia::deps include ::octavia::deps
validate_string($heartbeat_key) validate_legacy(String, 'validate_string', $heartbeat_key)
package { 'octavia-health-manager': package { 'octavia-health-manager':
ensure => $package_ensure, ensure => $package_ensure,

2
manifests/policy.pp
View File

@ -31,7 +31,7 @@ class octavia::policy (
include ::octavia::deps include ::octavia::deps
include ::octavia::params include ::octavia::params
validate_hash($policies) validate_legacy(Hash, 'validate_hash', $policies)
Openstacklib::Policy::Base { Openstacklib::Policy::Base {
file_path => $policy_path, file_path => $policy_path,

2
manifests/worker.pp
View File

@ -148,7 +148,7 @@ class octavia::worker (
set octavia::controller class before 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 ! $::octavia::controller::amp_flavor_id_real {
if $manage_nova_flavor { if $manage_nova_flavor {