diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-22 16:11:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-22 16:11:21 +0000 |
| commit | b0f6a45943800f4121f4093653c6c37969899f7f (patch) | |
| tree | 3dc548303ecab6e6d5783ba6c07a2a10308f22f3 /manifests/profile/base/pacemaker.pp | |
| parent | d355194bec2da69088d111955920fd14438aca7d (diff) | |
| parent | 95b432e9bc6295ed9f544db6077143c2f0660165 (diff) | |
Merge "use parameter to lookup the step instead of hiera again"
Diffstat (limited to 'manifests/profile/base/pacemaker.pp')
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index de107a9..1785656 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -38,9 +38,9 @@ class tripleo::profile::base::pacemaker ( $pacemaker_master = false } - $enable_fencing = str2bool(hiera('enable_fencing', false)) and hiera('step') >= 5 + $enable_fencing = str2bool(hiera('enable_fencing', false)) and $step >= 5 - if hiera('step') >= 1 { + if $step >= 1 { $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G')) $corosync_ipv6 = str2bool(hiera('corosync_ipv6', false)) if $corosync_ipv6 { @@ -78,7 +78,7 @@ class tripleo::profile::base::pacemaker ( } } - if hiera('step') >= 2 { + if $step >= 2 { if $pacemaker_master { include ::pacemaker::resource_defaults |