From 280a70bfafeca67cd124733e898fb8c6f05a039e Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 6 Sep 2016 15:19:13 +0200 Subject: 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 --- puppet/controller.yaml | 6 ------ 1 file changed, 6 deletions(-) (limited to 'puppet/controller.yaml') 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} -- cgit 1.2.3-korg