summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-07 13:50:18 +0000
committerGerrit Code Review <review@openstack.org>2017-04-07 13:50:18 +0000
commita9b9392c45f6b45e8f4d2db77d2fd98642178bf8 (patch)
tree1a7b9810b6befcc26209decd5b60f0d8e8765fcf /manifests
parentd826518a77378963ac3ca0b4d3f51ba967c2f313 (diff)
parent3589d945865feda586bdb516b3631ef2932aaaa1 (diff)
Merge "Make galera-ready exec refreshonly"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index bc5e644..031e80c 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -120,7 +120,7 @@ class tripleo::profile::pacemaker::database::mysql (
if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
tripleo::pacemaker::resource_restart_flag { 'galera-master':
subscribe => File['mysql-config-file'],
- }
+ } ~> Exec<| title == 'galera-ready' |>
}
if $step >= 2 {
@@ -145,7 +145,7 @@ class tripleo::profile::pacemaker::database::mysql (
},
require => [Class['::mysql::server'],
Pacemaker::Property['galera-role-node-property']],
- before => Exec['galera-ready'],
+ notify => Exec['galera-ready'],
}
exec { 'galera-ready' :
command => '/usr/bin/clustercheck >/dev/null',
@@ -153,6 +153,7 @@ class tripleo::profile::pacemaker::database::mysql (
tries => 180,
try_sleep => 10,
environment => ['AVAILABLE_WHEN_READONLY=0'],
+ refreshonly => true,
require => Exec['create-root-sysconfig-clustercheck'],
}
# We add a clustercheck db user and we will switch /etc/sysconfig/clustercheck