openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Make sure we pass the proper new pcs 0.10 variables"

This commit is contained in:
Zuul 2019-06-05 13:57:51 +00:00 committed by Gerrit Code Review
parent 517a0305b7 16c5f16925
commit fcdfd85a08
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/profile/base/pacemaker.pp
View File

@ -27,6 +27,16 @@
# (Optional) The number of times pcs commands should be retried.
# Defaults to hiera('pcs_tries', 20)
#
# [*pcs_user*]
# (Optional) The user to set up pcsd with
# Defaults to 'hacluster'
#
# [*pcs_password*]
# (Optional) The password to be used for the pcs_user. While it is
# optional as a parameter, the hiera key 'hacluster_pwd' *must* not
# be undefined or an error will be generated.
# Defaults to hiera('hacluster_pwd', undef)
#
# [*remote_short_node_names*]
# (Optional) List of short node names for pacemaker remote nodes
# Defaults to hiera('pacemaker_remote_short_node_names', [])
@ -74,6 +84,8 @@
class tripleo::profile::base::pacemaker (
$step = Integer(hiera('step')),
$pcs_tries = hiera('pcs_tries', 20),
$pcs_user = 'hacluster',
$pcs_password = hiera('hacluster_pwd', undef),
$remote_short_node_names = hiera('pacemaker_remote_short_node_names', []),
$remote_node_ips = hiera('pacemaker_remote_node_ips', []),
$remote_authkey = undef,
@ -90,8 +102,8 @@ class tripleo::profile::base::pacemaker (
fail("Count of ${remote_short_node_names} is not equal to count of ${remote_node_ips}")
}
if hiera('hacluster_pwd', undef) == undef {
fail("The 'hacluster_pwd' hiera key is undefined, did you forget to include ::tripleo::profile::base::pacemaker in your role?")
if $pcs_password == undef {
fail('The $pcs_password param is undefined, did you forget to include ::tripleo::profile::base::pacemaker in your role?')
}
Pcmk_resource <| |> {
@ -141,7 +153,7 @@ class tripleo::profile::base::pacemaker (
$cluster_setup_extras = $cluster_setup_extras_pre
}
class { '::pacemaker':
hacluster_pwd => hiera('hacluster_pwd'),
hacluster_pwd => $pcs_password,
}
-> class { '::pacemaker::corosync':
cluster_members => $pacemaker_cluster_members,
@ -201,6 +213,8 @@ class tripleo::profile::base::pacemaker (
op_params => "monitor interval=${remote_monitor_interval}",
tries => $remote_tries,
try_sleep => $remote_try_sleep,
pcs_user => $pcs_user,
pcs_password => $pcs_password,
before => Exec["exec-wait-for-${remote_short_node}"],
notify => Exec["exec-wait-for-${remote_short_node}"],
}

18
manifests/profile/base/pacemaker_remote.pp
View File

@ -26,6 +26,16 @@
# (Optional) The number of times pcs commands should be retried.
# Defaults to hiera('pcs_tries', 20)
#
# [*pcs_user*]
# (Optional) The user to set up pcsd with
# Defaults to 'hacluster'
#
# [*pcs_password*]
# (Optional) The password to be used for the pcs_user. While it is
# optional as a parameter, the hiera key 'hacluster_pwd' *must* not
# be undefined or an error will be generated.
# Defaults to hiera('hacluster_pwd', undef)
#
# [*enable_fencing*]
# (Optional) Whether or not to manage stonith devices for nodes
# Defaults to hiera('enable_fencing', false)
@ -38,11 +48,19 @@
class tripleo::profile::base::pacemaker_remote (
$remote_authkey,
$pcs_tries = hiera('pcs_tries', 20),
$pcs_user = 'hacluster',
$pcs_password = hiera('hacluster_pwd', undef),
$enable_fencing = hiera('enable_fencing', false),
$step = Integer(hiera('step')),
) {
if $pcs_password == undef {
fail('The $pcs_password param is and the hiera key "hacluster_pwd" hiera key are both undefined, this is not allowed')
}
class { '::pacemaker::remote':
pcs_user => $pcs_user,
pcs_password => $pcs_password,
remote_authkey => $remote_authkey,
use_pcsd => true,
}
if str2bool(hiera('docker_enabled', false)) {
include ::systemd::systemctl::daemon_reload