openstack/puppet-tripleo
Code Issues Proposed changes

Replace bootstrap_nodeid with SERVICE_short_bootstrap_node_name

Browse Source 
This solves the problem that bootstrap_nodeid, which is set to the
first node in each role via t-h-t, can match potentially more than
one node - e.g in the event that a service is deployed such that it
spans more than one role.

The SERVICE_short_bootstrap_node_name is automatically generated
based on the composable service template service_name, and this
considers all roles where the service is enabled, e.g it should
only evaluate true once regardles off the roles where the service
is enabled.

Change-Id: I48ec4549552910f3cb8db960b0ff10a6c61b4bb9
Partial-Bug: #1792613
(cherry picked from commit 9cde9139c4)
This commit is contained in:
Steven Hardy 2018-09-27 14:57:23 +01:00 committed by David J Peacock
parent a00b779cd3
commit 8a30b6a9e1
51 changed files with 115 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/aodh.pp
View File

@ -25,7 +25,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('aodh_api_bootstrap_node_name')
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
@ -73,7 +73,7 @@
class tripleo::profile::base::aodh (
$step = Integer(hiera('step')),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('aodh_api_bootstrap_node_name', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_password = hiera('aodh::rabbit_password'),

4
manifests/profile/base/aodh/api.pp
View File

@ -25,7 +25,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('aodh_api_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -51,7 +51,7 @@
class tripleo::profile::base::aodh::api (
$aodh_network = hiera('aodh_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('aodh_api_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),

4
manifests/profile/base/barbican/api.pp
View File

@ -25,7 +25,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('barbican_api_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -94,7 +94,7 @@
class tripleo::profile::base::barbican::api (
$barbican_network = hiera('barbican_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('barbican_api_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),

2
manifests/profile/base/barbican/backends.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('barbican_api_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates

4
manifests/profile/base/ceilometer/upgrade.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -29,7 +29,7 @@
#
class tripleo::profile::base::ceilometer::upgrade (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/cinder.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('cinder_api_short_bootstrap_node_name')
#
# [*cinder_enable_db_purge*]
# (Optional) Wheter to enable db purging
@ -75,7 +75,7 @@
# Defaults to hiera('cinder::rabbit_use_ssl', '0')
class tripleo::profile::base::cinder (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef),
$cinder_enable_db_purge = true,
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),

4
manifests/profile/base/cinder/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('cinder_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -63,7 +63,7 @@
# Defaults to undef.
#
class tripleo::profile::base::cinder::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$cinder_api_network = hiera('cinder_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),

4
manifests/profile/base/congress.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('congress_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step of the deployment
@ -51,7 +51,7 @@
# Defaults to hiera('congress::rabbit_use_ssl', '0')
class tripleo::profile::base::congress (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('congress_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/database/mongodb.pp
View File

@ -23,7 +23,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mongodb_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -36,7 +36,7 @@
#
class tripleo::profile::base::database::mongodb (
$mongodb_replset,
$bootstrap_node = downcase(hiera('bootstrap_nodeid')),
$bootstrap_node = downcase(hiera('mongodb_short_bootstrap_node_name')),
$step = Integer(hiera('step')),
$memory_limit = '20G',
) {

4
manifests/profile/base/database/mysql.pp
View File

@ -24,7 +24,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mysql_short_bootstrap_node_name')
#
# [*certificate_specs*]
# (Optional) The specifications to give to certmonger for the certificate
@ -99,7 +99,7 @@
#
class tripleo::profile::base::database::mysql (
$bind_address = $::hostname,
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mysql_short_bootstrap_node_name', undef),
$certificate_specs = {},
$cipher_list = '!SSLv2:kEECDH:kRSA:kEDH:kPSK:+3DES:!aNULL:!eNULL:!MD5:!EXP:!RC4:!SEED:!IDEA:!DES:!SSLv3:!TLSv1',
$enable_internal_tls = hiera('enable_internal_tls', false),

10
manifests/profile/base/database/redis.pp
View File

@ -18,9 +18,9 @@
#
# === Parameters
#
# [*bootstrap_nodeid*]
# [*redis_short_bootstrap_node_name*]
# (Optional) Hostname of Redis master
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('redis_short_bootstrap_node_name')
#
# [*certificate_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -67,7 +67,7 @@
# defaults to 6379
#
class tripleo::profile::base::database::redis (
$bootstrap_nodeid = hiera('bootstrap_nodeid'),
$redis_short_bootstrap_node_name = hiera('redis_short_bootstrap_node_name'),
$certificate_specs = hiera('redis_certificate_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$redis_network = hiera('redis_network', undef),
@ -102,10 +102,10 @@ class tripleo::profile::base::database::redis (
notify => Class['::redis'],
}
}
if downcase($bootstrap_nodeid) == $::hostname {
if downcase($redis_short_bootstrap_node_name) == $::hostname {
$slaveof = undef
} else {
$slaveof = "${bootstrap_nodeid} 6379"
$slaveof = "${redis_short_bootstrap_node_name} 6379"
}
class { '::redis' :
slaveof => $slaveof,

4
manifests/profile/base/glance/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('glance_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -83,7 +83,7 @@
# RBD client naem
# (optional) Defaults to hiera('glance::backend::rbd::rbd_store_user')
class tripleo::profile::base::glance::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('glance_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$glance_backend = downcase(hiera('glance_backend', 'swift')),

4
manifests/profile/base/gnocchi/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('gnocchi_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -69,7 +69,7 @@
# Defaults to hiera('incoming_storage_driver', undef)
#
class tripleo::profile::base::gnocchi::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('gnocchi_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$gnocchi_backend = downcase(hiera('gnocchi_backend', 'swift')),

4
manifests/profile/base/heat.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to downcase(hiera('bootstrap_nodeid'))
# Defaults to downcase(hiera('heat_engine_short_bootstrap_node_name'))
#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
@ -76,7 +76,7 @@
# Defaults to hiera('heat::rabbit_use_ssl', '0')
class tripleo::profile::base::heat (
$bootstrap_node = downcase(hiera('bootstrap_nodeid')),
$bootstrap_node = downcase(hiera('heat_engine_short_bootstrap_node_name')),
$manage_db_purge = hiera('heat_enable_db_purge', true),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),

4
manifests/profile/base/heat/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('heat_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -49,7 +49,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('heat_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$heat_api_network = hiera('heat_api_network', undef),

4
manifests/profile/base/heat/api_cfn.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('heat_api_cfn_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -49,7 +49,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::api_cfn (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('heat_api_cfn_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$heat_api_cfn_network = hiera('heat_api_cfn_network', undef),

4
manifests/profile/base/heat/engine.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('heat_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::heat::engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('heat_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/horizon.pp
View File

@ -25,7 +25,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('horizon_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -58,7 +58,7 @@
#
class tripleo::profile::base::horizon (
$step = Integer(hiera('step')),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('horizon_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$horizon_network = hiera('horizon_network', undef),

4
manifests/profile/base/ironic.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('ironic_api_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step of the deployment
@ -51,7 +51,7 @@
# Defaults to hiera('ironic::rabbit_use_ssl', '0')
class tripleo::profile::base::ironic (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('ironic_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/ironic/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('ironic_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -48,7 +48,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ironic::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('ironic_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$ironic_api_network = hiera('ironic_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),

4
manifests/profile/base/ironic_inspector.pp
View File

@ -20,14 +20,14 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('ironic_inspector_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
class tripleo::profile::base::ironic_inspector (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('ironic_inspector_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {

4
manifests/profile/base/keystone.pp
View File

@ -25,7 +25,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('keystone_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -144,7 +144,7 @@
#
class tripleo::profile::base::keystone (
$admin_endpoint_network = hiera('keystone_admin_api_network', undef),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('keystone_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$heat_admin_domain = undef,

4
manifests/profile/base/manila.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('manila_api_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step of the deployment
@ -71,7 +71,7 @@
# Defaults to hiera('manila::rabbit_use_ssl', '0')
class tripleo::profile::base::manila (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/manila/api.pp
View File

@ -48,7 +48,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('manila_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -84,7 +84,7 @@ class tripleo::profile::base::manila::api (
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$manila_api_network = hiera('manila_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),

4
manifests/profile/base/mistral.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mistral_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -72,7 +72,7 @@
# Defaults to hiera('mistral::rabbit_use_ssl', '0')
class tripleo::profile::base::mistral (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mistral_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/mistral/api.pp
View File

@ -45,7 +45,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mistral_api_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -53,7 +53,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::mistral::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mistral_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$mistral_api_network = hiera('mistral_api_network', undef),

4
manifests/profile/base/mistral/engine.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mistral_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::mistral::engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mistral_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/mistral/event_engine.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mistral_event_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::mistral::event_engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mistral_event_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/mistral/executor.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('mistral_executor_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::mistral::executor (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('mistral_executor_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/neutron/ovn_northd.pp
View File

@ -18,7 +18,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('ovn_dbs_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -26,7 +26,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::ovn_northd (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('ovn_dbs_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $step >= 4 {

4
manifests/profile/base/neutron/plugins/ml2.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_plugin_ml2_short_bootstrap_node_name')
#
# [*mechanism_drivers*]
# (Optional) The mechanism drivers to use with the Ml2 plugin
@ -39,7 +39,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::ml2 (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('neutron_plugin_ml2_short_bootstrap_node_name', undef),
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
$service_names = hiera('service_names'),
$step = Integer(hiera('step')),

4
manifests/profile/base/neutron/plugins/nsx.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_plugin_nsx_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::nsx (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('neutron_plugin_nsx_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/neutron/plugins/nuage.pp
View File

@ -18,7 +18,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_plugin_nuage_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -26,7 +26,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::nuage (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('neutron_plugin_nuage_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/neutron/plugins/opencontrail.pp
View File

@ -18,7 +18,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('contrail_neutron_plugin_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -26,7 +26,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::opencontrail (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('contrail_neutron_plugin_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/neutron/plugins/plumgrid.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_plugin_plumgrid_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::plugins::plumgrid (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('neutron_plugin_plumgrid_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/neutron/server.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -83,7 +83,7 @@
# defaults to 9696
#
class tripleo::profile::base::neutron::server (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('neutron_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$dvr_enabled = hiera('neutron::server::router_distributed', false),
$enable_internal_tls = hiera('enable_internal_tls', false),

4
manifests/profile/base/nova.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('nova_api_short_bootstrap_node_name')
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
@ -75,7 +75,7 @@
# Defaults to hiera('memcached_node_ips')
class tripleo::profile::base::nova (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_password = hiera('nova::rabbit_password'),

4
manifests/profile/base/nova/api.pp
View File

@ -18,7 +18,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('nova_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -72,7 +72,7 @@
# defaults to 8080
#
class tripleo::profile::base::nova::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('nova_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$nova_api_network = hiera('nova_api_network', undef),

4
manifests/profile/base/nova/ec2api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('ec2_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -84,7 +84,7 @@
# Defaults to 8789
#
class tripleo::profile::base::nova::ec2api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('ec2_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$ec2_api_network = hiera('ec2_api_network', undef),

4
manifests/profile/base/nova/placement.pp
View File

@ -18,7 +18,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('nova_placement_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -47,7 +47,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::nova::placement (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('nova_placement_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$nova_placement_network = hiera('nova_placement_network', undef),

4
manifests/profile/base/octavia/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('octavia_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -71,7 +71,7 @@
# defaults to hiera('octavia::api::service_name', undef)
#
class tripleo::profile::base::octavia::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('octavia_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$octavia_network = hiera('octavia_api_network', undef),

4
manifests/profile/base/panko/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('panko_api_short_bootstrap_node_name')
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -53,7 +53,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::panko::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('panko_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$enable_internal_tls = hiera('enable_internal_tls', false),
$panko_network = hiera('panko_api_network', undef),

4
manifests/profile/base/sahara.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('sahara_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step of the deployment
@ -71,7 +71,7 @@
# Defaults to hiera('sahara::rabbit_use_ssl', '0')
class tripleo::profile::base::sahara (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('sahara_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/sahara/engine.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('sahara_engine_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::sahara::engine (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('sahara_engine_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/swift/proxy.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('swift_proxy_short_bootstrap_node_name')
#
# [*ceilometer_enabled*]
# Whether the ceilometer pipeline is enabled.
@ -100,7 +100,7 @@
# defaults to 8080
#
class tripleo::profile::base::swift::proxy (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('swift_proxy_short_bootstrap_node_name', undef),
$ceilometer_enabled = true,
$ceilometer_messaging_driver = hiera('messaging_notify_service_name', 'rabbit'),
$ceilometer_messaging_hosts = any2array(hiera('rabbitmq_node_names', undef)),

4
manifests/profile/base/tacker.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('tacker_short_bootstrap_node_name')
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
@ -51,7 +51,7 @@
# Defaults to hiera('step')
class tripleo::profile::base::tacker (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('tacker_short_bootstrap_node_name', undef),
$oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
$oslomsg_rpc_password = hiera('tacker::rabbit_password'),

4
manifests/profile/base/trove/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('trove_api_short_bootstrap_node_name')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
@ -28,7 +28,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::trove::api (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('trove_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
) {
if $::hostname == downcase($bootstrap_node) {

4
manifests/profile/base/zaqar.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('zaqar_api_short_bootstrap_node_name')
#
# [*management_store*]
# (Optional) The management store for Zaqar.
@ -65,7 +65,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::zaqar (
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$bootstrap_node = hiera('zaqar_api_short_bootstrap_node_name', undef),
$management_store = 'mongodb',
$messaging_store = 'mongodb',
$certificates_specs = hiera('apache_certificates_specs', {}),

4
manifests/profile/pacemaker/neutron/lbaas.pp
View File

@ -25,11 +25,11 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
# Defaults to hiera('bootstrap_nodeid')
# Defaults to hiera('neutron_lbaas_api_short_bootstrap_node_name')
#
class tripleo::profile::pacemaker::neutron::lbaas (
$step = Integer(hiera('step')),
$pacemaker_master = hiera('bootstrap_nodeid'),
$pacemaker_master = hiera('neutron_lbaas_api_short_bootstrap_node_name'),
) {
include ::neutron::params

8
releasenotes/notes/remove_bootstrap_nodeid-c5109a575c538bda.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
All manifests no longer use the bootstrap_nodeid hiera key, since this
was generated per role and can result in multiple bootstrap nodes when
a service on more than one role. The SERVICE_short_bootstrap_node_name
key is used instead, which is automatically generated in tripleo-heat-templates
based on the service_name key of the service template role_data.

14
spec/classes/tripleo_profile_base_database_redis_spec.rb
View File

@ -22,7 +22,7 @@ describe 'tripleo::profile::base::database::redis' do
context 'with step less than 2' do
let(:params) { {
:step => 1,
:bootstrap_nodeid => 'node.example.com',
:redis_short_bootstrap_node_name => 'node.example.com',
:redis_node_ips => []
} }
@ -37,7 +37,7 @@ describe 'tripleo::profile::base::database::redis' do
context 'with step 2 on bootstrap node' do
let(:params) { {
:step => 2,
:bootstrap_nodeid => 'node.example.com',
:redis_short_bootstrap_node_name => 'node.example.com',
:redis_node_ips => ['10.0.0.1']
} }
@ -52,7 +52,7 @@ describe 'tripleo::profile::base::database::redis' do
context 'with step 2 on bootstrap node with capital letters' do
let(:params) { {
:step => 2,
:bootstrap_nodeid => 'NODE.example.com',
:redis_short_bootstrap_node_name => 'NODE.example.com',
:redis_node_ips => ['10.0.0.1']
} }
@ -65,13 +65,13 @@ describe 'tripleo::profile::base::database::redis' do
context 'with step 2 not on bootstrap node' do
let(:params) { {
:step => 2,
:bootstrap_nodeid => 'othernode.example.com',
:redis_short_bootstrap_node_name => 'othernode.example.com',
:redis_node_ips => ['10.0.0.1']
} }
it 'should configure redis' do
is_expected.to contain_class('tripleo::profile::base::database::redis')
is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
is_expected.to contain_class('redis').with(:slaveof => "#{params[:redis_short_bootstrap_node_name]} 6379")
is_expected.to_not contain_class('redis::sentinel')
is_expected.to_not contain_class('tripleo::redis_notification')
end
@ -80,13 +80,13 @@ describe 'tripleo::profile::base::database::redis' do
context 'with step 2 with multiple nodes' do
let(:params) { {
:step => 2,
:bootstrap_nodeid => 'othernode.example.com',
:redis_short_bootstrap_node_name => 'othernode.example.com',
:redis_node_ips => ['10.0.0.1', '10.0.0.2']
} }
it 'should configure redis' do
is_expected.to contain_class('tripleo::profile::base::database::redis')
is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379")
is_expected.to contain_class('redis').with(:slaveof => "#{params[:redis_short_bootstrap_node_name]} 6379")
is_expected.to contain_class('redis::sentinel')
is_expected.to contain_class('tripleo::redis_notification')
end