summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-02 16:31:47 +0000
committerGerrit Code Review <review@openstack.org>2015-11-02 16:31:47 +0000
commit04327663a90fdb2caa963b21072e599a66e61d05 (patch)
tree690d173a555b50e1e2f489d44b95aaa970697cc1
parent619ea4cf90b42b5654982bda96d4f3e7183aa3b5 (diff)
parentb892ca4705282fe3b857a5eaa7c0f0c8a944d36e (diff)
Merge "Ensure memcached resource uses interleave=true"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 0b082e6c..38ee9c39 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -331,7 +331,7 @@ if hiera('step') >= 2 {
}
pacemaker::resource::service { $::memcached::params::service_name :
- clone_params => true,
+ clone_params => "interleave=true",
require => Class['::memcached'],
}