Merge "Add check for bootstrap_node for downcase"

This commit is contained in:
Zuul 2020-04-09 05:35:17 +00:00 committed by Gerrit Code Review
commit ba6febbc3a
65 changed files with 65 additions and 65 deletions

View File

@ -92,7 +92,7 @@ class tripleo::profile::base::aodh (
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -56,7 +56,7 @@ class tripleo::profile::base::aodh::api (
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -115,7 +115,7 @@ class tripleo::profile::base::barbican::api (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -32,7 +32,7 @@ class tripleo::profile::base::ceilometer::upgrade (
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -95,7 +95,7 @@ class tripleo::profile::base::cinder (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -74,7 +74,7 @@ class tripleo::profile::base::cinder::api (
$step = Integer(hiera('step')),
$keystone_resources_managed = hiera('keystone_resources_managed', true),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
$manage_type = $keystone_resources_managed
} else {

View File

@ -122,7 +122,7 @@ class tripleo::profile::base::database::mysql (
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -36,7 +36,7 @@ class tripleo::profile::base::designate::central (
$step = Integer(hiera('step')),
$pools_file_content = undef,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -156,7 +156,7 @@ class tripleo::profile::base::glance::api (
# DEPRECATED PARAMETERS
$glance_rbd_client_name = undef,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -67,7 +67,7 @@ class tripleo::profile::base::gnocchi (
) {
warning('Gnocchi is deprecated and is going to be removed in future.')
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -80,7 +80,7 @@ class tripleo::profile::base::gnocchi::api (
$step = Integer(hiera('step')),
$incoming_storage_driver = hiera('incoming_storage_driver', undef),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -55,7 +55,7 @@ class tripleo::profile::base::heat::api (
$heat_api_network = hiera('heat_api_network', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -55,7 +55,7 @@ class tripleo::profile::base::heat::api_cfn (
$heat_api_cfn_network = hiera('heat_api_cfn_network', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::heat::engine (
$bootstrap_node = hiera('heat_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -65,7 +65,7 @@ class tripleo::profile::base::horizon (
$neutron_options = hiera('horizon::neutron_options', {}),
$memcached_ips = hiera('memcached_node_ips')
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -61,7 +61,7 @@ class tripleo::profile::base::ironic (
$oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'),
) {
# Database is accessed by both API and conductor, hence it's here.
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -57,7 +57,7 @@ class tripleo::profile::base::ironic::api (
include tripleo::profile::base::ironic
include tripleo::profile::base::ironic::authtoken
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -42,7 +42,7 @@ class tripleo::profile::base::ironic::conductor (
) {
include tripleo::profile::base::ironic
# Database is accessed by both API and conductor, hence it's here.
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -61,7 +61,7 @@ class tripleo::profile::base::ironic_inspector (
include tripleo::profile::base::ironic_inspector::authtoken
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -201,7 +201,7 @@ class tripleo::profile::base::keystone (
$memcached_ips = hiera('memcached_node_ips', []),
$keystone_resources_managed = hiera('keystone_resources_managed', undef),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -90,7 +90,7 @@ class tripleo::profile::base::manila (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -90,7 +90,7 @@ class tripleo::profile::base::manila::api (
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -91,7 +91,7 @@ class tripleo::profile::base::mistral (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -60,7 +60,7 @@ class tripleo::profile::base::mistral::api (
$mistral_api_wsgi_enabled = hiera('mistral_wsgi_enabled', true),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::mistral::engine (
$bootstrap_node = hiera('mistral_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::mistral::event_engine (
$bootstrap_node = hiera('mistral_event_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -37,7 +37,7 @@ class tripleo::profile::base::mistral::executor (
$step = Integer(hiera('step')),
$docker_group = false,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -32,7 +32,7 @@ class tripleo::profile::base::neutron::ovn_northd (
if $step >= 4 {
# Note this only runs on the first node in the cluster when
# deployed on a role where multiple nodes exist.
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
include ovn::northd
}
}

View File

@ -44,7 +44,7 @@ class tripleo::profile::base::neutron::plugins::ml2 (
$service_names = hiera('service_names'),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::neutron::plugins::nsx (
$bootstrap_node = hiera('neutron_plugin_nsx_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::plugins::nuage (
$bootstrap_node = hiera('neutron_plugin_nuage_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -29,7 +29,7 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
$bootstrap_node = hiera('contrail_neutron_plugin_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
$bootstrap_node = hiera('neutron_plugin_plumgrid_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -100,7 +100,7 @@ class tripleo::profile::base::neutron::server (
$tls_proxy_port = 9696,
$designate_api_enabled = hiera('designate_api_enabled', false),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -96,7 +96,7 @@ class tripleo::profile::base::nova (
$memcached_ips = hiera('memcached_node_ips'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -77,7 +77,7 @@ class tripleo::profile::base::nova::api (
$metadata_tls_proxy_fqdn = undef,
$metadata_tls_proxy_port = 8775,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -34,7 +34,7 @@ class tripleo::profile::base::nova::conductor (
include tripleo::profile::base::nova
include nova::db
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -97,7 +97,7 @@ class tripleo::profile::base::nova::ec2api (
$metadata_tls_proxy_fqdn = undef,
$metadata_tls_proxy_port = 8789,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -53,7 +53,7 @@ class tripleo::profile::base::nova::metadata (
$nova_metadata_network = hiera('nova_metadata_network', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -73,7 +73,7 @@ class tripleo::profile::base::octavia::api (
$ovn_db_host = hiera('ovn_dbs_vip', undef),
$ovn_nb_port = hiera('ovn::northbound::port', undef),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -60,7 +60,7 @@ class tripleo::profile::base::panko::api (
$enable_panko_expirer = hiera('enable_panko_expirer', true),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::placement (
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -53,7 +53,7 @@ class tripleo::profile::base::placement::api (
$placement_network = hiera('placement_network', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -222,7 +222,7 @@ class tripleo::profile::base::rabbitmq (
}
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$rabbitmq_bootstrapnode = true
} else {
$rabbitmq_bootstrapnode = false

View File

@ -90,7 +90,7 @@ class tripleo::profile::base::sahara (
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::sahara::engine (
$bootstrap_node = hiera('sahara_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -118,7 +118,7 @@ class tripleo::profile::base::swift::proxy (
$tls_proxy_fqdn = undef,
$tls_proxy_port = 8080,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -31,7 +31,7 @@ class tripleo::profile::base::trove::api (
$bootstrap_node = hiera('trove_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true
} else {
$sync_db = false

View File

@ -75,7 +75,7 @@ class tripleo::profile::base::zaqar (
$redis_vip = hiera('redis_vip', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
$is_bootstrap = false

View File

@ -36,7 +36,7 @@ class tripleo::profile::pacemaker::ceph_nfs (
$step = hiera('step'),
$pcs_tries = hiera('pcs_tries', 20),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -44,7 +44,7 @@ class tripleo::profile::pacemaker::cinder::backup (
stop => '/bin/true',
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -72,7 +72,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
$pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -43,7 +43,7 @@ class tripleo::profile::pacemaker::cinder::volume (
stop => '/bin/true',
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -72,7 +72,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
$tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef),
$bundle_user = 'root',
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -114,7 +114,7 @@ class tripleo::profile::pacemaker::database::mysql (
$pcs_tries = hiera('pcs_tries', 20),
$open_files_limit = 16384,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -167,7 +167,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$step = Integer(hiera('step')),
$open_files_limit = 16384,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -111,7 +111,7 @@ class tripleo::profile::pacemaker::database::redis (
$tls_proxy_fqdn = undef,
$tls_proxy_port = 6379,
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -128,7 +128,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
$tls_priorities = hiera('tripleo::pacemaker::tls_priorities', undef),
$bundle_user = 'root',
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -61,7 +61,7 @@ class tripleo::profile::pacemaker::haproxy (
manage_firewall => $manage_firewall,
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -114,7 +114,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
) {
include tripleo::profile::base::haproxy
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -36,7 +36,7 @@ class tripleo::profile::pacemaker::manila (
$step = Integer(hiera('step')),
$pcs_tries = hiera('pcs_tries', 20),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -77,7 +77,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
$pcs_tries = hiera('pcs_tries', 20),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -118,7 +118,7 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
$listen_on_master_ip_only = hiera('tripleo::profile::pacemaker::ovn_dbs_bundle::listen_on_master_ip_only', 'yes'),
) {
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -86,7 +86,7 @@ class tripleo::profile::pacemaker::rabbitmq (
$rabbit_nodes = []
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false

View File

@ -136,7 +136,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
$rabbit_nodes = []
}
if $::hostname == downcase($bootstrap_node) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$pacemaker_master = true
} else {
$pacemaker_master = false