diff options
Diffstat (limited to 'manifests/profile/pacemaker')
48 files changed, 162 insertions, 229 deletions
diff --git a/manifests/profile/pacemaker/apache.pp b/manifests/profile/pacemaker/apache.pp index 4b0b16e..980b3a4 100644 --- a/manifests/profile/pacemaker/apache.pp +++ b/manifests/profile/pacemaker/apache.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::apache ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/ceilometer.pp b/manifests/profile/pacemaker/ceilometer.pp index 23021fc..531b4bc 100644 --- a/manifests/profile/pacemaker/ceilometer.pp +++ b/manifests/profile/pacemaker/ceilometer.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::tripleo::profile::base::ceilometer $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb')) diff --git a/manifests/profile/pacemaker/ceilometer/agent/central.pp b/manifests/profile/pacemaker/ceilometer/agent/central.pp index e227614..90266be 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/central.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/central.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::central ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::agent::central diff --git a/manifests/profile/pacemaker/ceilometer/agent/notification.pp b/manifests/profile/pacemaker/ceilometer/agent/notification.pp index 868bb22..e419356 100644 --- a/manifests/profile/pacemaker/ceilometer/agent/notification.pp +++ b/manifests/profile/pacemaker/ceilometer/agent/notification.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::agent::notification ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::agent::notification diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp index 3006be8..0eddaec 100644 --- a/manifests/profile/pacemaker/ceilometer/api.pp +++ b/manifests/profile/pacemaker/ceilometer/api.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::ceilometer::api ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer include ::tripleo::profile::base::ceilometer::api diff --git a/manifests/profile/pacemaker/ceilometer/collector.pp b/manifests/profile/pacemaker/ceilometer/collector.pp index 6610a07..d0f7217 100644 --- a/manifests/profile/pacemaker/ceilometer/collector.pp +++ b/manifests/profile/pacemaker/ceilometer/collector.pp @@ -27,19 +27,12 @@ # for more details. # Defaults to hiera('step') # -# [*sync_db*] -# (Optional) Whether to run db sync -# Defaults to undef -# class tripleo::profile::pacemaker::ceilometer::collector ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), - $sync_db = true, ) { - include ::ceilometer::params include ::tripleo::profile::pacemaker::ceilometer - include ::tripleo::profile::base::ceilometer::collector if $step >= 5 and downcase($::hostname) == $pacemaker_master { diff --git a/manifests/profile/pacemaker/cinder/api.pp b/manifests/profile/pacemaker/cinder/api.pp index 6354244..d18942d 100644 --- a/manifests/profile/pacemaker/cinder/api.pp +++ b/manifests/profile/pacemaker/cinder/api.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::api ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - Service <| tag == 'cinder-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/cinder/scheduler.pp b/manifests/profile/pacemaker/cinder/scheduler.pp index 00b0696..e25ef54 100644 --- a/manifests/profile/pacemaker/cinder/scheduler.pp +++ b/manifests/profile/pacemaker/cinder/scheduler.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::scheduler ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - Service <| tag == 'cinder-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp index d909831..5a581eb 100644 --- a/manifests/profile/pacemaker/cinder/volume.pp +++ b/manifests/profile/pacemaker/cinder/volume.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::cinder::volume ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - Service <| tag == 'cinder::volume' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/core.pp b/manifests/profile/pacemaker/core.pp index b8b0781..359a817 100644 --- a/manifests/profile/pacemaker/core.pp +++ b/manifests/profile/pacemaker/core.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::core ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/database/mongodb.pp b/manifests/profile/pacemaker/database/mongodb.pp index 15c84d7..e4b5fcf 100644 --- a/manifests/profile/pacemaker/database/mongodb.pp +++ b/manifests/profile/pacemaker/database/mongodb.pp @@ -32,10 +32,9 @@ # class tripleo::profile::pacemaker::database::mongodb ( $mongodb_replset, - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $step >= 1 { include ::mongodb::globals include ::mongodb::client diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index cc95092..529aeac 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -26,7 +26,6 @@ class tripleo::profile::pacemaker::database::mysql ( $step = hiera('step'), ) { - if $::hostname == downcase(hiera('bootstrap_nodeid')) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp index 27dcbe9..8a37ce9 100644 --- a/manifests/profile/pacemaker/database/redis.pp +++ b/manifests/profile/pacemaker/database/redis.pp @@ -31,7 +31,6 @@ # for more details. # Defaults to hiera('step') # - class tripleo::profile::pacemaker::database::redis ( $bootstrap_node = hiera('bootstrap_nodeid'), $enable_load_balancer = hiera('enable_load_balancer', true), diff --git a/manifests/profile/pacemaker/glance.pp b/manifests/profile/pacemaker/glance.pp index 91fddf6..664b91f 100644 --- a/manifests/profile/pacemaker/glance.pp +++ b/manifests/profile/pacemaker/glance.pp @@ -22,19 +22,10 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# # [*glance_backend*] # (Optional) Glance backend(s) to use. # Defaults to downcase(hiera('glance_backend', 'swift')) # -# [*glance_file_pcmk_manage*] -# (Optional) Whether or not manage glance_file_pcmk. -# Defaults to hiera('glance_file_pcmk_manage', false) -# # [*glance_file_pcmk_device*] # (Optional) Device to mount glance file backend. # Defaults to hiera('glance_file_pcmk_device', '') @@ -47,21 +38,29 @@ # (Optional) Filesystem type to mount glance file backend. # Defaults to hiera('glance_file_pcmk_fstype', '') # +# [*glance_file_pcmk_manage*] +# (Optional) Whether or not manage glance_file_pcmk. +# Defaults to hiera('glance_file_pcmk_manage', false) +# # [*glance_file_pcmk_options*] # (Optional) pcmk options to mount Glance file backend.. # Defaults to hiera('glance_file_pcmk_options', '') # +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# class tripleo::profile::pacemaker::glance ( $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), $glance_backend = downcase(hiera('glance_backend', 'swift')), - $glance_file_pcmk_manage = hiera('glance_file_pcmk_manage', false), $glance_file_pcmk_device = hiera('glance_file_pcmk_device', ''), $glance_file_pcmk_directory = hiera('glance_file_pcmk_directory', ''), $glance_file_pcmk_fstype = hiera('glance_file_pcmk_fstype', ''), + $glance_file_pcmk_manage = hiera('glance_file_pcmk_manage', false), $glance_file_pcmk_options = hiera('glance_file_pcmk_options', ''), + $step = hiera('step'), ) { - Service <| tag == 'glance-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/gnocchi.pp b/manifests/profile/pacemaker/gnocchi.pp index c8630ce..5bfc174 100644 --- a/manifests/profile/pacemaker/gnocchi.pp +++ b/manifests/profile/pacemaker/gnocchi.pp @@ -18,26 +18,24 @@ # # === Parameters # -# [*gnocchi_indexer_backend*] -# (Optional) Gnocchi indexer backend -# Defaults to mysql -# # [*bootstrap_node*] # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*gnocchi_indexer_backend*] +# (Optional) Gnocchi indexer backend +# Defaults to mysql +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # - class tripleo::profile::pacemaker::gnocchi ( + $bootstrap_node = hiera('bootstrap_nodeid'), $gnocchi_indexer_backend = downcase(hiera('gnocchi_indexer_backend', 'mysql')), - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $step = hiera('step'), ) { - Service <| tag == 'gnocchi-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/gnocchi/api.pp b/manifests/profile/pacemaker/gnocchi/api.pp index ede4c9a..29f2435 100644 --- a/manifests/profile/pacemaker/gnocchi/api.pp +++ b/manifests/profile/pacemaker/gnocchi/api.pp @@ -22,15 +22,11 @@ # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') - +# class tripleo::profile::pacemaker::gnocchi::api ( - $step = hiera('step'), + $step = hiera('step'), ) { - include ::tripleo::profile::pacemaker::gnocchi include ::tripleo::profile::pacemaker::apache - - class { '::tripleo::profile::base::gnocchi::api': - step => $step, - } + include ::tripleo::profile::base::gnocchi::api } diff --git a/manifests/profile/pacemaker/gnocchi/metricd.pp b/manifests/profile/pacemaker/gnocchi/metricd.pp index 4ac5e74..c9dc2d9 100644 --- a/manifests/profile/pacemaker/gnocchi/metricd.pp +++ b/manifests/profile/pacemaker/gnocchi/metricd.pp @@ -27,12 +27,10 @@ # for more details. # Defaults to hiera('step') # - class tripleo::profile::pacemaker::gnocchi::metricd ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::gnocchi::params include ::tripleo::profile::pacemaker::gnocchi diff --git a/manifests/profile/pacemaker/gnocchi/statsd.pp b/manifests/profile/pacemaker/gnocchi/statsd.pp index 526dcac..42d30b9 100644 --- a/manifests/profile/pacemaker/gnocchi/statsd.pp +++ b/manifests/profile/pacemaker/gnocchi/statsd.pp @@ -27,12 +27,10 @@ # for more details. # Defaults to hiera('step') # - class tripleo::profile::pacemaker::gnocchi::statsd ( $pacemaker_master = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - include ::gnocchi::params include ::tripleo::profile::pacemaker::gnocchi diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp index a7aca58..1b83d9b 100644 --- a/manifests/profile/pacemaker/haproxy.pp +++ b/manifests/profile/pacemaker/haproxy.pp @@ -22,21 +22,20 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*enable_load_balancer*] +# (Optional) Whether load balancing is enabled for this cluster +# Defaults to hiera('enable_load_balancer', true) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*enable_load_balancer*] -# (Optional) Whether load balancing is enabled for this cluster -# Defaults to hiera('enable_load_balancer', true) -# class tripleo::profile::pacemaker::haproxy ( $bootstrap_node = hiera('bootstrap_nodeid'), + $enable_load_balancer = hiera('enable_load_balancer', true), $step = hiera('step'), - $enable_load_balancer = hiera('enable_load_balancer', true) ) { - include ::tripleo::profile::base::haproxy if $::hostname == downcase($bootstrap_node) { diff --git a/manifests/profile/pacemaker/heat.pp b/manifests/profile/pacemaker/heat.pp index e72f02a..e3c1598 100644 --- a/manifests/profile/pacemaker/heat.pp +++ b/manifests/profile/pacemaker/heat.pp @@ -18,20 +18,14 @@ # # === Parameters # -# [*bootstrap_node*] -# (Optional) The hostname of the node responsible for bootstrapping tasks -# Defaults to hiera('bootstrap_nodeid') -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $step = hiera('step'), ) { - Service <| tag == 'heat-service' |> { hasrestart => true, restart => '/bin/true', @@ -39,8 +33,6 @@ class tripleo::profile::pacemaker::heat ( stop => '/bin/true', } - class { '::tripleo::profile::base::heat': - bootstrap_master => $bootstrap_node, - } + include ::tripleo::profile::base::heat } diff --git a/manifests/profile/pacemaker/heat/api.pp b/manifests/profile/pacemaker/heat/api.pp index ed9ca5b..0fc4f8a 100644 --- a/manifests/profile/pacemaker/heat/api.pp +++ b/manifests/profile/pacemaker/heat/api.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/heat/api_cfn.pp b/manifests/profile/pacemaker/heat/api_cfn.pp index d3ba6e4..1230c6b 100644 --- a/manifests/profile/pacemaker/heat/api_cfn.pp +++ b/manifests/profile/pacemaker/heat/api_cfn.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api_cfn ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/heat/api_cloudwatch.pp b/manifests/profile/pacemaker/heat/api_cloudwatch.pp index a7784fb..6110a0c 100644 --- a/manifests/profile/pacemaker/heat/api_cloudwatch.pp +++ b/manifests/profile/pacemaker/heat/api_cloudwatch.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::api_cloudwatch ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/heat/engine.pp b/manifests/profile/pacemaker/heat/engine.pp index 158c138..88744ad 100644 --- a/manifests/profile/pacemaker/heat/engine.pp +++ b/manifests/profile/pacemaker/heat/engine.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::heat::engine ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index f48193a..db14aea 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -22,21 +22,20 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*enable_load_balancer*] +# (Optional) Whether load balancing is enabled for this cluster +# Defaults to hiera('enable_load_balancer', true) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*enable_load_balancer*] -# (Optional) Whether load balancing is enabled for this cluster -# Defaults to hiera('enable_load_balancer', true) -# class tripleo::profile::pacemaker::keystone ( $bootstrap_node = hiera('bootstrap_nodeid'), + $enable_load_balancer = hiera('enable_load_balancer', true), $step = hiera('step'), - $enable_load_balancer = hiera('enable_load_balancer', true) ) { - Service <| tag == 'keystone-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index f3666c2..43ae875 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -22,86 +22,85 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') +# [*cinder_volume_type*] +# (Optional) +# Defaults to hiera('manila::backend::generic::cinder_volume_type', '') +# +# [*driver_handles_share_servers*] +# (Optional) +# Defaults to hiera('manila::backend::generic::driver_handles_share_servers') # # [*manila_generic_enable*] # (Optional) Enable the generic backend. # Defaults to hiera('manila_generic_enable_backend', 'false') # -# [*driver_handles_share_servers*] +# [*max_time_to_attach*] # (Optional) -# Defaults to hiera('manila::backend::generic::driver_handles_share_servers') +# Defaults to hiera('manila::backend::generic::max_time_to_attach') # -# [*smb_template_config_path*] +# [*max_time_to_create_volume*] # (Optional) -# Defaults to hiera('manila::backend::generic::smb_template_config_path') +# Defaults to hiera('manila::backend::generic::max_time_to_create_volume') # -# [*volume_name_template*] -# (Optional) -# Defaults to hiera('manila::backend::generic::volume_name_template') - -# [*volume_snapshot_name_template*] +# [*service_instance_flavor_id*] # (Optional) -# Defaults to hiera('manila::backend::generic::volume_snapshot_name_template') +# Defaults to hiera('manila::service_instance::service_instance_flavor_id') # -# [*share_mount_path*] +# [*service_instance_password*] # (Optional) -# Defaults to hiera('manila::backend::generic::share_mount_path') +# Defaults to hiera('manila::service_instance::service_instance_password') # -# [*max_time_to_create_volume*] +# [*service_instance_smb_config_path*] # (Optional) -# Defaults to hiera('manila::backend::generic::max_time_to_create_volume') +# Defaults to downcase(hiera('manila::backend::generic::service_instance_smb_config_path')) # -# [*max_time_to_attach*] +# [*service_instance_user*] # (Optional) -# Defaults to hiera('manila::backend::generic::max_time_to_attach') +# Defaults to hiera('manila::service_instance::service_instance_user') # -# [*service_instance_smb_config_path*] +# [*share_mount_path*] # (Optional) -# Defaults to downcase(hiera('manila::backend::generic::service_instance_smb_config_path')) +# Defaults to hiera('manila::backend::generic::share_mount_path') # # [*share_volume_fstype*] # (Optional) # Defaults to hiera('manila::backend::generic::share_volume_fstype') # -# [*cinder_volume_type*] +# [*smb_template_config_path*] # (Optional) -# Defaults to hiera('manila::backend::generic::cinder_volume_type', '') +# Defaults to hiera('manila::backend::generic::smb_template_config_path') # -# [*service_instance_user*] -# (Optional) -# Defaults to hiera('manila::service_instance::service_instance_user') - -# [*service_instance_password*] +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# [*volume_name_template*] # (Optional) -# Defaults to hiera('manila::service_instance::service_instance_password') - -# [*service_instance_flavor_id*] +# Defaults to hiera('manila::backend::generic::volume_name_template') +# +# [*volume_snapshot_name_template*] # (Optional) -# Defaults to hiera('manila::service_instance::service_instance_flavor_id') +# Defaults to hiera('manila::backend::generic::volume_snapshot_name_template') # class tripleo::profile::pacemaker::manila ( $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), - $manila_generic_enable = hiera('manila_generic_enable_backend', false), + $cinder_volume_type = hiera('manila::backend::generic::cinder_volume_type', ''), $driver_handles_share_servers = hiera('manila::backend::generic::driver_handles_share_servers'), - $smb_template_config_path = hiera('manila::backend::generic::smb_template_config_path'), - $volume_name_template = hiera('manila::backend::generic::volume_name_template'), - $volume_snapshot_name_template = hiera('manila::backend::generic::volume_snapshot_name_template'), - $share_mount_path = hiera('manila::backend::generic::share_mount_path'), - $max_time_to_create_volume = hiera('manila::backend::generic::max_time_to_create_volume'), + $manila_generic_enable = hiera('manila_generic_enable_backend', false), $max_time_to_attach = hiera('manila::backend::generic::max_time_to_attach'), + $max_time_to_create_volume = hiera('manila::backend::generic::max_time_to_create_volume'), + $service_instance_flavor_id = hiera('manila::service_instance::service_instance_flavor_id'), + $service_instance_password = hiera('manila::service_instance::service_instance_password'), $service_instance_smb_config_path = hiera('manila::backend::generic::service_instance_smb_config_path'), - $share_volume_fstype = hiera('manila::backend::generic::share_volume_fstype'), - $cinder_volume_type = hiera('manila::backend::generic::cinder_volume_type', ''), $service_instance_user = hiera('manila::service_instance::service_instance_user'), - $service_instance_password = hiera('manila::service_instance::service_instance_password'), - $service_instance_flavor_id = hiera('manila::service_instance::service_instance_flavor_id'), + $share_mount_path = hiera('manila::backend::generic::share_mount_path'), + $share_volume_fstype = hiera('manila::backend::generic::share_volume_fstype'), + $smb_template_config_path = hiera('manila::backend::generic::smb_template_config_path'), + $step = hiera('step'), + $volume_name_template = hiera('manila::backend::generic::volume_name_template'), + $volume_snapshot_name_template = hiera('manila::backend::generic::volume_snapshot_name_template'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/memcached.pp b/manifests/profile/pacemaker/memcached.pp index 09af5d6..2a6bd4d 100644 --- a/manifests/profile/pacemaker/memcached.pp +++ b/manifests/profile/pacemaker/memcached.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::memcached ( $bootstrap_node = hiera('bootstrap_nodeid'), $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 0298298..6525126 100644 --- a/manifests/profile/pacemaker/neutron.pp +++ b/manifests/profile/pacemaker/neutron.pp @@ -18,22 +18,14 @@ # # === Parameters # -# [*step*] -# (Optional) The step in the deployment -# Defaults to hiera('step') -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) +# [*enable_dhcp*] +# (Optional) Whether to include the Neutron DHCP agent pacemaker profile +# Defaults to hiera('neutron::enable_dhcp_agent', false) # # [*enable_l3*] # (Optional) Whether to include the Neutron L3 agent pacemaker profile # Defaults to hiera('neutron::enable_l3_agent', false) # -# [*enable_dhcp*] -# (Optional) Whether to include the Neutron DHCP agent pacemaker profile -# Defaults to hiera('neutron::enable_dhcp_agent', false) -# # [*enable_metadata*] # (Optional) Whether to include the Neutron Metadata agent pacemaker profile # Defaults to hiera('neutron::enable_metadata_agent', false) @@ -42,16 +34,24 @@ # (Optional) Whether to include the Neutron OVS agent pacemaker profile # Defaults to hiera('neutron::enable_ovs_agent', false) # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# +# [*step*] +# (Optional) The step in the deployment +# Defaults to hiera('step') +# class tripleo::profile::pacemaker::neutron ( - $step = hiera('step'), - $pacemaker_master = hiera('bootstrap_nodeid', undef), # We can drop the hiera defaults once the neutron roles are decomposed - $enable_l3 = hiera('neutron::enable_l3_agent', false), $enable_dhcp = hiera('neutron::enable_dhcp_agent', false), + $enable_l3 = hiera('neutron::enable_l3_agent', false), $enable_metadata = hiera('neutron::enable_metadata_agent', false), $enable_ovs = hiera('neutron::enable_ovs_agent', false), + #Don't drop below this line + $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - Service <| tag == 'neutron-service' |> { diff --git a/manifests/profile/pacemaker/neutron/dhcp.pp b/manifests/profile/pacemaker/neutron/dhcp.pp index d738f21..e76012f 100644 --- a/manifests/profile/pacemaker/neutron/dhcp.pp +++ b/manifests/profile/pacemaker/neutron/dhcp.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::dhcp ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::dhcp diff --git a/manifests/profile/pacemaker/neutron/l3.pp b/manifests/profile/pacemaker/neutron/l3.pp index fec4af2..c3ae3b8 100644 --- a/manifests/profile/pacemaker/neutron/l3.pp +++ b/manifests/profile/pacemaker/neutron/l3.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::l3 ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::l3 diff --git a/manifests/profile/pacemaker/neutron/metadata.pp b/manifests/profile/pacemaker/neutron/metadata.pp index 4fccea2..f09edba 100644 --- a/manifests/profile/pacemaker/neutron/metadata.pp +++ b/manifests/profile/pacemaker/neutron/metadata.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::metadata ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::metadata diff --git a/manifests/profile/pacemaker/neutron/midonet.pp b/manifests/profile/pacemaker/neutron/midonet.pp index 9d380f0..453641a 100644 --- a/manifests/profile/pacemaker/neutron/midonet.pp +++ b/manifests/profile/pacemaker/neutron/midonet.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::midonet ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { include ::neutron::params include ::tripleo::profile::pacemaker::neutron diff --git a/manifests/profile/pacemaker/neutron/ovs.pp b/manifests/profile/pacemaker/neutron/ovs.pp index a330de1..7e3b15c 100644 --- a/manifests/profile/pacemaker/neutron/ovs.pp +++ b/manifests/profile/pacemaker/neutron/ovs.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid', undef) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid', undef) -# class tripleo::profile::pacemaker::neutron::ovs ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid', undef), + $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron include ::tripleo::profile::base::neutron::ovs diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp index e5e13b7..aff682a 100644 --- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp +++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp @@ -20,10 +20,7 @@ # class tripleo::profile::pacemaker::neutron::plugins::ml2 { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron - include ::tripleo::profile::base::neutron::plugins::ml2 - } diff --git a/manifests/profile/pacemaker/neutron/plugins/nuage.pp b/manifests/profile/pacemaker/neutron/plugins/nuage.pp index de00761..03cdb7e 100644 --- a/manifests/profile/pacemaker/neutron/plugins/nuage.pp +++ b/manifests/profile/pacemaker/neutron/plugins/nuage.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::nuage { - include ::tripleo::profile::base::neutron::plugins::nuage - } diff --git a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp index f1568e9..438245a 100644 --- a/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp +++ b/manifests/profile/pacemaker/neutron/plugins/opencontrail.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::opencontrail { - include ::tripleo::profile::base::neutron::plugins::opencontrail - } diff --git a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp index 7313ef9..38b2179 100644 --- a/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp +++ b/manifests/profile/pacemaker/neutron/plugins/plumgrid.pp @@ -20,7 +20,5 @@ # class tripleo::profile::pacemaker::neutron::plugins::plumgrid { - include ::tripleo::profile::base::neutron::plugins::plumgrid - } diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp index acd7993..d817ee7 100644 --- a/manifests/profile/pacemaker/neutron/server.pp +++ b/manifests/profile/pacemaker/neutron/server.pp @@ -31,7 +31,6 @@ class tripleo::profile::pacemaker::neutron::server ( $pacemaker_master = hiera('bootstrap_nodeid', undef), $step = hiera('step'), ) { - include ::neutron::params include ::tripleo::profile::pacemaker::neutron diff --git a/manifests/profile/pacemaker/nova.pp b/manifests/profile/pacemaker/nova.pp index 62a8042..222035e 100644 --- a/manifests/profile/pacemaker/nova.pp +++ b/manifests/profile/pacemaker/nova.pp @@ -25,7 +25,6 @@ class tripleo::profile::pacemaker::nova ( $step = hiera('step'), ) { - Service <| tag == 'nova-service' |> { diff --git a/manifests/profile/pacemaker/nova/api.pp b/manifests/profile/pacemaker/nova/api.pp index 5e8f15f..188beda 100644 --- a/manifests/profile/pacemaker/nova/api.pp +++ b/manifests/profile/pacemaker/nova/api.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to downcase(hiera('bootstrap_nodeid')) +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to downcase(hiera('bootstrap_nodeid')) -# class tripleo::profile::pacemaker::nova::api ( - $step = hiera('step'), $pacemaker_master = downcase(hiera('bootstrap_nodeid')), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/conductor.pp b/manifests/profile/pacemaker/nova/conductor.pp index 3e390e0..f2605cb 100644 --- a/manifests/profile/pacemaker/nova/conductor.pp +++ b/manifests/profile/pacemaker/nova/conductor.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::conductor ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/consoleauth.pp b/manifests/profile/pacemaker/nova/consoleauth.pp index ad538c4..6cd8c15 100644 --- a/manifests/profile/pacemaker/nova/consoleauth.pp +++ b/manifests/profile/pacemaker/nova/consoleauth.pp @@ -18,18 +18,18 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::consoleauth ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { include ::nova::params diff --git a/manifests/profile/pacemaker/nova/scheduler.pp b/manifests/profile/pacemaker/nova/scheduler.pp index 9e78c30..8c387d2 100644 --- a/manifests/profile/pacemaker/nova/scheduler.pp +++ b/manifests/profile/pacemaker/nova/scheduler.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::scheduler ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - include ::nova::params include ::tripleo::profile::pacemaker::nova include ::tripleo::profile::base::nova::scheduler diff --git a/manifests/profile/pacemaker/nova/vncproxy.pp b/manifests/profile/pacemaker/nova/vncproxy.pp index ec71ca7..3652daa 100644 --- a/manifests/profile/pacemaker/nova/vncproxy.pp +++ b/manifests/profile/pacemaker/nova/vncproxy.pp @@ -18,20 +18,19 @@ # # === Parameters # +# [*pacemaker_master*] +# (Optional) The hostname of the pacemaker master +# Defaults to hiera('bootstrap_nodeid') +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('bootstrap_nodeid') -# class tripleo::profile::pacemaker::nova::vncproxy ( - $step = hiera('step'), $pacemaker_master = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - include ::nova::params include ::tripleo::profile::pacemaker::nova include ::tripleo::profile::base::nova::vncproxy diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp index efb91b5..93edec9 100644 --- a/manifests/profile/pacemaker/rabbitmq.pp +++ b/manifests/profile/pacemaker/rabbitmq.pp @@ -22,21 +22,20 @@ # (Optional) The hostname of the node responsible for bootstrapping tasks # Defaults to hiera('bootstrap_nodeid') # +# [*erlang_cookie*] +# (Optional) Content of erlang cookie. +# Defaults to hiera('rabbitmq::erlang_cookie'). +# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. # Defaults to hiera('step') # -# [*erlang_cookie*] -# (Optional) Content of erlang cookie. -# Defaults to hiera('rabbitmq::erlang_cookie'). -# class tripleo::profile::pacemaker::rabbitmq ( $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), $erlang_cookie = hiera('rabbitmq::erlang_cookie'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/sahara.pp b/manifests/profile/pacemaker/sahara.pp index 0627017..07cd882 100644 --- a/manifests/profile/pacemaker/sahara.pp +++ b/manifests/profile/pacemaker/sahara.pp @@ -26,7 +26,6 @@ class tripleo::profile::pacemaker::sahara ( $step = hiera('step'), ) { - Service <| tag == 'sahara-service' |> { hasrestart => true, restart => '/bin/true', diff --git a/manifests/profile/pacemaker/sahara/api.pp b/manifests/profile/pacemaker/sahara/api.pp index eed82dd..0e3d97a 100644 --- a/manifests/profile/pacemaker/sahara/api.pp +++ b/manifests/profile/pacemaker/sahara/api.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::sahara::api ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { diff --git a/manifests/profile/pacemaker/sahara/engine.pp b/manifests/profile/pacemaker/sahara/engine.pp index 850c645..ada6c06 100644 --- a/manifests/profile/pacemaker/sahara/engine.pp +++ b/manifests/profile/pacemaker/sahara/engine.pp @@ -28,10 +28,9 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::sahara::engine ( - $bootstrap_node = hiera('bootstrap_nodeid'), - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid'), + $step = hiera('step'), ) { - if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true } else { |