summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-11 16:01:33 +0000
committerGerrit Code Review <review@openstack.org>2017-06-11 16:01:33 +0000
commitb8a10fbc15fcffed9e5925fbe496762e0739d086 (patch)
treec18a6948d66d05d8a86467847e22c85d1d7d0fb2
parentd2f525cf7f30c182a035d91a1c2a9f06590b0d2b (diff)
parentbb826c000ff72f21e88744e4253b3bbf9a86077b (diff)
Merge "Install rsync package for galera"
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp9
-rw-r--r--releasenotes/notes/galera-install-rsync-b2f2504f12cc0cfd.yaml6
2 files changed, 15 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 031e80c..476a1e5 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -100,6 +100,15 @@ class tripleo::profile::pacemaker::database::mysql (
}
}
+ # since we are configuring rsync for wsrep_sst_method, we ought to make sure
+ # it's installed. We only includ this at step 2 since puppet-rsync may be
+ # included later and also adds the package resource.
+ if $step == 2 {
+ if ! defined(Package['rsync']) {
+ package {'rsync':}
+ }
+ }
+
# remove_default_accounts parameter will execute some mysql commands
# to remove the default accounts created by MySQL package.
# We need MySQL running to run the commands successfully, so better to
diff --git a/releasenotes/notes/galera-install-rsync-b2f2504f12cc0cfd.yaml b/releasenotes/notes/galera-install-rsync-b2f2504f12cc0cfd.yaml
new file mode 100644
index 0000000..4b2fe0d
--- /dev/null
+++ b/releasenotes/notes/galera-install-rsync-b2f2504f12cc0cfd.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - The mysql pacemaker profile now makes sure that the
+ rsync package is installed since it configures
+ wsrep_sst_method for galera to use rsync. See
+ https://bugs.launchpad.net/tripleo/+bug/1693003