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.pp | |
parent | 27e457e0dd21f767efedbc4d0430b4cbd974db0d (diff) | |
parent | 31c4167d86436632ff2b097eaf0bbb5682fb23c9 (diff) |
Merge "Composable roles within services - Redis"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller.pp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index d2859dd2..9b4e76cc 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -61,25 +61,6 @@ if hiera('step') >= 2 { } } - # Redis - $redis_node_ips = hiera('redis_node_ips') - $redis_master_hostname = downcase(hiera('bootstrap_nodeid')) - - if $redis_master_hostname == $::hostname { - $slaveof = undef - } else { - $slaveof = "${redis_master_hostname} 6379" - } - class {'::redis' : - slaveof => $slaveof, - } - - if count($redis_node_ips) > 1 { - Class['::tripleo::redis_notification'] -> Service['redis-sentinel'] - include ::redis::sentinel - include ::tripleo::redis_notification - } - if str2bool(hiera('enable_galera', true)) { $mysql_config_file = '/etc/my.cnf.d/galera.cnf' } else { |