10 files changed, 39 insertions, 12 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 4d7af033..7a4df796 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -62,6 +62,10 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_ips}
+                redis_node_ips:
+                  list_join:
+                  - ','
+                  - {get_param: controller_ips}
 
 outputs:
   config_id:
diff --git a/puppet/ceph-storage-post-puppet.yaml b/puppet/ceph-storage-post-puppet.yaml
index 5e1c42fa..53ecbe1f 100644
--- a/puppet/ceph-storage-post-puppet.yaml
+++ b/puppet/ceph-storage-post-puppet.yaml
@@ -1,7 +1,7 @@
 heat_template_version: 2014-10-16
 
 description: >
-  OpenStack Ceph Storage node post deployment for Puppet.
+  OpenStack ceph storage node post deployment for Puppet
 
 parameters:
   servers:
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index 1599a323..e9f82c2e 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -1,5 +1,5 @@
 heat_template_version: 2014-10-16
-description: 'Common Ceph Storage Configuration for Puppet'
+description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
   Flavor:
     description: Flavor for the Ceph Storage node.
diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index 28e87800..e11493c4 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -1,7 +1,5 @@
 heat_template_version: 2014-10-16
-description: 'Common Block Storage Post Deployment'
-# NOTE: this is a noop for os-apply-config style deployments because
-# post deployment ordering is controlled by tripleo-image-elements
+description: 'OpenStack cinder storage post deployment for Puppet'
 
 parameters:
   servers:
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index c7fd2ca0..ecea763b 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -1,5 +1,5 @@
 heat_template_version: 2014-10-16
-description: 'Block Storage Configuration w/ Puppet'
+description: 'OpenStack cinder storage configured by Puppet'
 parameters:
   Image:
     default: overcloud-cinder-volume
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 007c7103..a23a1db3 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -807,7 +807,8 @@ resources:
                 # Rabbit
                 rabbitmq::node_ip_address: {get_input: controller_host}
                 rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
-
+                # Redis
+                redis::bind: {get_input: controller_host}
                 # Misc
                 memcached::listen_ip: {get_input: controller_host}
                 neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index d7e515ac..5cf9f350 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -13,6 +13,11 @@ rabbitmq::repos_ensure: false
 
 mongodb::server::replset: tripleo
 
+redis::port: 6379
+redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}"
+redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
+redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
+
 # service tenant
 nova::api::admin_tenant_name: 'service'
 glance::api::keystone_tenant: 'service'
@@ -90,6 +95,7 @@ tripleo::loadbalancer::nova_metadata: true
 tripleo::loadbalancer::nova_novncproxy: true
 tripleo::loadbalancer::mysql: true
 tripleo::loadbalancer::rabbitmq: true
+tripleo::loadbalancer::redis: true
 tripleo::loadbalancer::swift_proxy_server: true
 tripleo::loadbalancer::ceilometer: true
 tripleo::loadbalancer::heat_api: true
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 08f9d427..8a8c0eb8 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -79,12 +79,32 @@ if hiera('step') >= 2 {
     }
   }
 
+  # Redis
+  $redis_node_ips = split(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
+    class {'::tripleo::redis_notification' :
+      haproxy_monitor_ip => hiera('tripleo::loadbalancer::controller_virtual_ip'),
+    }
+  }
+
   if str2bool(hiera('enable_galera', 'true')) {
     $mysql_config_file = '/etc/my.cnf.d/galera.cnf'
   } else {
     $mysql_config_file = '/etc/my.cnf.d/server.cnf'
   }
-
   # TODO Galara
   class { 'mysql::server':
     config_file => $mysql_config_file,
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 3f069319..edceba97 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -1,7 +1,5 @@
 heat_template_version: 2014-10-16
-description: 'Swift Storage Post Deployment'
-# NOTE: this is a noop for os-apply-config style deployments because
-# post deployment ordering is controlled by tripleo-image-elements
+description: 'OpenStack swift storage node post deployment for Puppet'
 
 parameters:
   servers:
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 6d446b00..eba44e6c 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -1,5 +1,5 @@
 heat_template_version: 2014-10-16
-description: 'Common Swift Storage Configuration'
+description: 'OpenStack swift storage node configured by Puppet'
 parameters:
   Flavor:
     description: Flavor for Swift storage nodes to request when deploying.