Merge "Ensure access to Redis is password protected" into stable/liberty

This commit is contained in:
Jenkins 2016-03-16 23:50:23 +00:00 committed by Gerrit Code Review
commit e6d92e0dab
2 changed files with 15 additions and 1 deletions

View File

@ -307,6 +307,10 @@ parameters:
default: false
description: Enable IPv6 in RabbitMQ
type: boolean
RedisPassword:
description: The password for Redis
type: string
hidden: true
SnmpdReadonlyUserName:
default: ro_snmp_user
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
@ -982,6 +986,7 @@ resources:
RabbitClientPort: {get_param: RabbitClientPort}
RabbitFDLimit: {get_param: RabbitFDLimit}
RabbitIPv6: {get_param: RabbitIPv6}
RedisPassword: {get_param: RedisPassword}
SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}

View File

@ -599,6 +599,10 @@ parameters:
default: false
description: Enable IPv6 in RabbitMQ
type: boolean
RedisPassword:
type: string
description: The password to access the Redis service
hidden: true
RedisVirtualIP:
type: string
default: '' # Has to be here because of the ignored empty value bug
@ -1127,7 +1131,8 @@ resources:
- ''
- - 'redis://'
- {get_param: RedisVirtualIPUri}
- ':6379'
- ':6379/?password='
- {get_param: RedisPassword}
ceilometer_dsn:
list_join:
- ''
@ -1202,6 +1207,7 @@ resources:
horizon_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
redis_password: {get_param: RedisPassword}
redis_vip: {get_param: RedisVirtualIP}
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
mysql_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
@ -1537,6 +1543,9 @@ resources:
rabbit_ipv6: {get_input: rabbit_ipv6}
# Redis
redis::bind: {get_input: redis_network}
redis::requirepass: {get_input: redis_password}
redis::masterauth: {get_input: redis_password}
redis::sentinel_auth_pass: {get_input: redis_password}
redis_vip: {get_input: redis_vip}
# Firewall
tripleo::firewall::manage_firewall: {get_input: manage_firewall}