openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Make sure remotes are fully up before proceeding"

This commit is contained in:
Zuul 2018-06-15 12:03:27 +00:00 committed by Gerrit Code Review
parent 220170dfb2 5968aeb320
commit 1e9385eaa2
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,13 +174,26 @@ class tripleo::profile::base::pacemaker (
if $pacemaker_master and count($remote_short_node_names) > 0 {
# Creates a { "node" => "ip_address", ...} hash
$remotes_hash = hash(zip($remote_short_node_names, $remote_node_ips))
pacemaker::resource::remote { $remote_short_node_names:
remote_address => $remotes_hash[$title],
reconnect_interval => $remote_reconnect_interval,
op_params => "monitor interval=${remote_monitor_interval}",
verify_on_create => true,
tries => $remote_tries,
try_sleep => $remote_try_sleep,
$remote_short_node_names.each |String $remote_short_node| {
pacemaker::resource::remote { $remote_short_node:
remote_address => $remotes_hash[$remote_short_node],
reconnect_interval => $remote_reconnect_interval,
op_params => "monitor interval=${remote_monitor_interval}",
tries => $remote_tries,
try_sleep => $remote_try_sleep,
before => Exec["exec-wait-for-${remote_short_node}"],
notify => Exec["exec-wait-for-${remote_short_node}"],
}
$check_command = "pcs status | grep -q -e \"${remote_short_node}.*Started\""
exec { "exec-wait-for-${remote_short_node}":
path => '/usr/sbin:/usr/bin:/sbin:/bin',
command => $check_command,
unless => $check_command,
timeout => 30,
tries => 180,
try_sleep => 10,
tag => 'remote_ready',
}
}
}
}