X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller.pp;h=89569ae5544b30cbd59676ab38421fa6fd7adf27;hb=eef24da48592154bc29f748a09e7fd23ced9e776;hp=d2859dd2465dcb79b0e676f84d1a1eded8bc4fbe;hpb=27e457e0dd21f767efedbc4d0430b4cbd974db0d;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index d2859dd2..89569ae5 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 {
@@ -181,7 +162,6 @@ if hiera('step') >= 4 {
   include ::nova::config
   include ::nova::api
   include ::nova::cert
-  include ::nova::conductor
   include ::nova::consoleauth
   include ::nova::network::neutron
   include ::nova::vncproxy