diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-06-04 03:34:51 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-06-04 03:34:51 +0000 |
commit | dc507862061360e0d777cdcb96cfb46d8bac75fe (patch) | |
tree | 2e3abca03a1b92a84c52f94224709690cc3aa7a8 /puppet/manifests/overcloud_controller_pacemaker.pp | |
parent | 27e457e0dd21f767efedbc4d0430b4cbd974db0d (diff) | |
parent | 31c4167d86436632ff2b097eaf0bbb5682fb23c9 (diff) |
Merge "Composable roles within services - Redis"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 5070f32b..dc53d6d4 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -107,12 +107,6 @@ if hiera('step') >= 1 { } } - # Redis - class { '::redis' : - service_manage => false, - notify_service => false, - } - # Galera if str2bool(hiera('enable_galera', true)) { $mysql_config_file = '/etc/my.cnf.d/galera.cnf' @@ -225,15 +219,6 @@ if hiera('step') >= 2 { require => Class['::mysql::server'], before => Exec['galera-ready'], } - - pacemaker::resource::ocf { 'redis': - ocf_agent_name => 'heartbeat:redis', - master_params => '', - meta_params => 'notify=true ordered=true interleave=true', - resource_params => 'wait_last_known_master=true', - require => Class['::redis'], - } - } $mysql_root_password = hiera('mysql::server::root_password') $mysql_clustercheck_password = hiera('mysql_clustercheck_password') |