summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-28 12:20:39 +0000
committerGerrit Code Review <review@openstack.org>2015-05-28 12:20:39 +0000
commit93f4097e4de41c97d6fa000f39f2d3f1a9ce1f2b (patch)
tree104bc32383e278c43547fc747f636f9c7d1fc2b1 /puppet/manifests
parentc4d1907494edc18f79d93bba911285c3b027c926 (diff)
parentc6e237b7cf8b81f118dc58a9ffa3473c526332c3 (diff)
Merge "Add Memcache as a Pacemaker resource"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp11
1 files changed, 9 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 191cc792..5b5854da 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -104,6 +104,11 @@ if hiera('step') >= 1 {
}
}
+ # Memcached
+ class {'::memcached' :
+ service_manage => false,
+ }
+
# Galera
if str2bool(hiera('enable_galera', 'true')) {
$mysql_config_file = '/etc/my.cnf.d/galera.cnf'
@@ -166,6 +171,10 @@ if hiera('step') >= 2 {
pacemaker::resource::service { 'haproxy':
clone_params => true,
}
+ pacemaker::resource::service { $::memcached::params::service_name :
+ clone_params => true,
+ require => Class['::memcached'],
+ }
pacemaker::resource::ocf { 'rabbitmq':
ocf_agent_name => 'heartbeat:rabbitmq-cluster',
@@ -351,8 +360,6 @@ MYSQL_HOST=localhost\n",
include ::ceph::profile::osd
}
- # Memcached
- include ::memcached
} #END STEP 2