Add strict validation about boolean parameters
This ensures the parameters used by if-else logic accept only boolean values because non-boolean can result in unexpected behavior. Change-Id: I9f98a8c3d470a45f62d1165f32a783a840aa7bdb
This commit is contained in:
parent
e0f4b775dc
commit
63904655f1
|
@ -25,16 +25,16 @@
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
# [*workers*]
|
# [*workers*]
|
||||||
# (Optional) Number of workers for Murano Api
|
# (optional) number of workers for Murano Api
|
||||||
# Defaults to $facts['os_workers']
|
# defaults to $facts['os_workers']
|
||||||
#
|
#
|
||||||
class murano::api(
|
class murano::api(
|
||||||
$manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$enabled = true,
|
Boolean $enabled = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$host = $facts['os_service_default'],
|
$host = $facts['os_service_default'],
|
||||||
$port = $facts['os_service_default'],
|
$port = $facts['os_service_default'],
|
||||||
$workers = $facts['os_workers'],
|
$workers = $facts['os_workers'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include murano::deps
|
include murano::deps
|
||||||
|
|
|
@ -43,15 +43,15 @@
|
||||||
# Defaults to $facts['os_service_default'].
|
# Defaults to $facts['os_service_default'].
|
||||||
#
|
#
|
||||||
class murano::cfapi(
|
class murano::cfapi(
|
||||||
$tenant = 'admin',
|
$tenant = 'admin',
|
||||||
$manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$enabled = true,
|
Boolean $enabled = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$bind_host = $facts['os_service_default'],
|
$bind_host = $facts['os_service_default'],
|
||||||
$bind_port = $facts['os_service_default'],
|
$bind_port = $facts['os_service_default'],
|
||||||
$auth_url = 'http://127.0.0.1:5000',
|
$auth_url = 'http://127.0.0.1:5000',
|
||||||
$user_domain_name = $facts['os_service_default'],
|
$user_domain_name = $facts['os_service_default'],
|
||||||
$project_domain_name = $facts['os_service_default'],
|
$project_domain_name = $facts['os_service_default'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include murano::deps
|
include murano::deps
|
||||||
|
|
|
@ -57,14 +57,14 @@ class murano::dashboard(
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$dashboard_name = undef,
|
$dashboard_name = undef,
|
||||||
$repo_url = undef,
|
$repo_url = undef,
|
||||||
$enable_glare = false,
|
Boolean $enable_glare = false,
|
||||||
$collect_static_script = '/usr/share/openstack-dashboard/manage.py',
|
$collect_static_script = '/usr/share/openstack-dashboard/manage.py',
|
||||||
$metadata_dir = '/var/cache/murano-dashboard',
|
$metadata_dir = '/var/cache/murano-dashboard',
|
||||||
$max_file_size = '5',
|
$max_file_size = '5',
|
||||||
$dashboard_debug_level = 'DEBUG',
|
$dashboard_debug_level = 'DEBUG',
|
||||||
$client_debug_level = 'ERROR',
|
$client_debug_level = 'ERROR',
|
||||||
$log_handler = 'file',
|
$log_handler = 'file',
|
||||||
$sync_db = true,
|
Boolean $sync_db = true,
|
||||||
$image_filter_project_id = undef,
|
$image_filter_project_id = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
# Defaults to $facts['os_workers']
|
# Defaults to $facts['os_workers']
|
||||||
#
|
#
|
||||||
class murano::engine(
|
class murano::engine(
|
||||||
$manage_service = true,
|
Boolean $manage_service = true,
|
||||||
$enabled = true,
|
Boolean $enabled = true,
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$workers = $facts['os_workers'],
|
$workers = $facts['os_workers'],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include murano::deps
|
include murano::deps
|
||||||
|
|
|
@ -235,11 +235,11 @@ class murano(
|
||||||
$service_url = undef,
|
$service_url = undef,
|
||||||
$service_host = '127.0.0.1',
|
$service_host = '127.0.0.1',
|
||||||
$service_port = '8082',
|
$service_port = '8082',
|
||||||
$use_ssl = false,
|
Boolean $use_ssl = false,
|
||||||
$cert_file = $facts['os_service_default'],
|
$cert_file = $facts['os_service_default'],
|
||||||
$key_file = $facts['os_service_default'],
|
$key_file = $facts['os_service_default'],
|
||||||
$ca_file = $facts['os_service_default'],
|
$ca_file = $facts['os_service_default'],
|
||||||
$use_neutron = true,
|
Boolean $use_neutron = true,
|
||||||
$external_network = $::murano::params::default_external_network,
|
$external_network = $::murano::params::default_external_network,
|
||||||
$default_router = $facts['os_service_default'],
|
$default_router = $facts['os_service_default'],
|
||||||
$default_nameservers = $facts['os_service_default'],
|
$default_nameservers = $facts['os_service_default'],
|
||||||
|
@ -251,7 +251,7 @@ class murano(
|
||||||
$database_max_retries = undef,
|
$database_max_retries = undef,
|
||||||
$database_retry_interval = undef,
|
$database_retry_interval = undef,
|
||||||
$database_max_overflow = undef,
|
$database_max_overflow = undef,
|
||||||
$sync_db = true,
|
Boolean $sync_db = true,
|
||||||
Boolean $purge_config = false,
|
Boolean $purge_config = false,
|
||||||
$amqp_durable_queues = $facts['os_service_default'],
|
$amqp_durable_queues = $facts['os_service_default'],
|
||||||
) inherits murano::params {
|
) inherits murano::params {
|
||||||
|
|
Loading…
Reference in New Issue