aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-09-06 15:19:13 +0200
committerJiri Stransky <jistr@redhat.com>2016-09-06 15:34:13 +0200
commit280a70bfafeca67cd124733e898fb8c6f05a039e (patch)
tree8fe501e57bc915546eb1934772f91f83285b3be3 /puppet
parent4488b0fdf809413cdd0e6deb92de879224cda383 (diff)
Set Redis VIP on all nodes
Move Redis VIP from controller-only to all nodes so that we don't assume where Redis is deployed. Change-Id: I55f8d48e3e077951fbcc88158dd6f21a2fe5f457 Related-Bug: #1618510 Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml4
-rw-r--r--puppet/controller.yaml6
2 files changed, 4 insertions, 6 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 7aa29b24..109fc8fb 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -24,6 +24,9 @@ parameters:
type: comma_delimited_list
NetVipMap:
type: json
+ RedisVirtualIP:
+ type: string
+ default: ''
ServiceNetMap:
type: json
DeployIdentifier:
@@ -153,6 +156,7 @@ resources:
internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]}
storage_virtual_ip: {get_param: [NetVipMap, storage]}
storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]}
+ redis_vip: {get_param: RedisVirtualIP}
# public_virtual_ip and controller_virtual_ip are needed in
# both HAproxy & keepalived.
tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, external]}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index c85546fa..14848f97 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -62,9 +62,6 @@ parameters:
default: nic1
description: What interface to bridge onto br-ex for network nodes.
type: string
- RedisVirtualIP:
- type: string
- default: '' # Has to be here because of the ignored empty value bug
SwiftRawDisks:
default: {}
description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
@@ -300,7 +297,6 @@ resources:
bootstack_nodeid: {get_attr: [Controller, name]}
enable_load_balancer: {get_param: EnableLoadBalancer}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
- redis_vip: {get_param: RedisVirtualIP}
# Map heat metadata into hiera datafiles
ControllerConfig:
@@ -355,8 +351,6 @@ resources:
# Pacemaker
enable_load_balancer: {get_input: enable_load_balancer}
- # Redis
- redis_vip: {get_input: redis_vip}
# Misc
tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}