summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJohn Trowbridge <trown@redhat.com>2016-01-25 10:59:49 -0500
committerJohn Trowbridge <trown@redhat.com>2016-01-25 10:59:49 -0500
commit403b182d94bff370d88c34d283929c133fd0a699 (patch)
tree557e60b02e6c4f6ccfc4b1dc7587c73f5d8c432e /puppet/manifests
parent1d7167e0b70b6d3da195287aff81c191de900ca5 (diff)
Remove empty value for wsrep_notify_cmd
This was being silently ignored by the mysql puppet module prior to this commit.[1] However, now that empty values are allowed, the overcloud deploy fails because the option --wsrep_notify_cmd requires an argument. This is not currently failing on master because we are pinned to an old puppet-mysql. We will need to remove that pin in order to get on a newer delorean repo though. Also, this is breaking stable/liberty HA job because we use the packaged OPM there. [1] https://github.com/puppetlabs/puppetlabs-mysql/commit/e30e0bc958761890ea4f06cdd3f1fc7242a00fe2 Change-Id: I9e07efe1650831e81e9a783428554578874aa765 Closes-Bug: 1537720
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a9adbd5d..e0286162 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -158,7 +158,6 @@ if hiera('step') >= 1 {
'wsrep_auto_increment_control' => '1',
'wsrep_drupal_282555_workaround'=> '0',
'wsrep_causal_reads' => '0',
- 'wsrep_notify_cmd' => '',
'wsrep_sst_method' => 'rsync',
},
}