aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker/database
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-22 16:11:21 +0000
committerGerrit Code Review <review@openstack.org>2016-07-22 16:11:21 +0000
commitb0f6a45943800f4121f4093653c6c37969899f7f (patch)
tree3dc548303ecab6e6d5783ba6c07a2a10308f22f3 /manifests/profile/pacemaker/database
parentd355194bec2da69088d111955920fd14438aca7d (diff)
parent95b432e9bc6295ed9f544db6077143c2f0660165 (diff)
Merge "use parameter to lookup the step instead of hiera again"
Diffstat (limited to 'manifests/profile/pacemaker/database')
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 1acdf0d..80015d0 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -72,7 +72,7 @@ class tripleo::profile::pacemaker::database::mysql (
mysql_server_options => $mysqld_options,
}
- if hiera('step') >= 2 and $pacemaker_master {
+ if $step >= 2 and $pacemaker_master {
if $pacemaker_master {
pacemaker::resource::ocf { 'galera' :
ocf_agent_name => 'heartbeat:galera',
@@ -129,7 +129,7 @@ class tripleo::profile::pacemaker::database::mysql (
}
}
- if hiera('step') >= 4 or ( hiera('step') >= 3 and $pacemaker_master ) {
+ if $step >= 4 or ( $step >= 3 and $pacemaker_master ) {
# At this stage we are guaranteed that the clustercheck db user exists
# so we switch the resource agent to use it.
$mysql_clustercheck_password = hiera('mysql_clustercheck_password')
@@ -144,7 +144,7 @@ MYSQL_HOST=localhost\n",
}
}
- if hiera('step') >= 5 {
+ if $step >= 5 {
# We now make sure that the root db password is set to a random one
# At first installation /root/.my.cnf will be empty and we connect without a root
# password. On second runs or updates /root/.my.cnf will already be populated