openstack/tripleo-heat-templates
Code Issues Proposed changes

Set Redis VIP on all nodes

Browse Source 
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
This commit is contained in:
Jiri Stransky 2016-09-06 15:19:13 +02:00
parent 4488b0fdf8
commit 280a70bfaf
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud.yaml
View File

@ -440,7 +440,6 @@ resources:
properties: properties:
CloudDomain: {get_param: CloudDomain} CloudDomain: {get_param: CloudDomain}
controllerExtraConfig: {get_param: controllerExtraConfig} controllerExtraConfig: {get_param: controllerExtraConfig}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMap, endpoint_map]} EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
Hostname: Hostname:
@ -712,6 +711,7 @@ resources:
keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]} keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}
keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]} keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
NetVipMap: {get_attr: [VipMap, net_ip_map]} NetVipMap: {get_attr: [VipMap, net_ip_map]}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}
DeployIdentifier: {get_param: DeployIdentifier} DeployIdentifier: {get_param: DeployIdentifier}
UpdateIdentifier: {get_param: UpdateIdentifier} UpdateIdentifier: {get_param: UpdateIdentifier}

4
puppet/all-nodes-config.yaml
View File

@ -24,6 +24,9 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
NetVipMap: NetVipMap:
type: json type: json
RedisVirtualIP:
type: string
default: ''
ServiceNetMap: ServiceNetMap:
type: json type: json
DeployIdentifier: DeployIdentifier:
@ -153,6 +156,7 @@ resources:
internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]} internal_api_virtual_ip: {get_param: [NetVipMap, internal_api]}
storage_virtual_ip: {get_param: [NetVipMap, storage]} storage_virtual_ip: {get_param: [NetVipMap, storage]}
storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]} storage_mgmt_virtual_ip: {get_param: [NetVipMap, storage_mgmt]}
redis_vip: {get_param: RedisVirtualIP}
# public_virtual_ip and controller_virtual_ip are needed in # public_virtual_ip and controller_virtual_ip are needed in
# both HAproxy & keepalived. # both HAproxy & keepalived.
tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, external]} tripleo::haproxy::public_virtual_ip: {get_param: [NetVipMap, external]}

6
puppet/controller.yaml
View File

@ -62,9 +62,6 @@ parameters:
default: nic1 default: nic1
description: What interface to bridge onto br-ex for network nodes. description: What interface to bridge onto br-ex for network nodes.
type: string type: string
RedisVirtualIP:
type: string
default: '' # Has to be here because of the ignored empty value bug
SwiftRawDisks: SwiftRawDisks:
default: {} default: {}
description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})' 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]} bootstack_nodeid: {get_attr: [Controller, name]}
enable_load_balancer: {get_param: EnableLoadBalancer} enable_load_balancer: {get_param: EnableLoadBalancer}
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
redis_vip: {get_param: RedisVirtualIP}
# Map heat metadata into hiera datafiles # Map heat metadata into hiera datafiles
ControllerConfig: ControllerConfig:
@ -355,8 +351,6 @@ resources:
# Pacemaker # Pacemaker
enable_load_balancer: {get_input: enable_load_balancer} enable_load_balancer: {get_input: enable_load_balancer}
# Redis
redis_vip: {get_input: redis_vip}
# Misc # Misc
tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]} tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}