openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix broken metadata_settings for redis templates" into stable/queens

This commit is contained in:
Zuul 2019-08-02 22:42:01 +00:00 committed by Gerrit Code Review
parent e5f6ec75c3 e0f50b4b3a
commit 8dcb25878d
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/services/database/redis.yaml
View File

@ -198,16 +198,6 @@ outputs:
- {} - {}
metadata_settings: metadata_settings:
get_attr: [RedisBase, role_data, metadata_settings] get_attr: [RedisBase, role_data, metadata_settings]
if:
- internal_tls_enabled
-
- service: redis
network: {get_param: [ServiceNetMap, RedisNetwork]}
type: vip
- service: redis
network: {get_param: [ServiceNetMap, RedisNetwork]}
type: node
- null
host_prep_tasks: host_prep_tasks:
- name: create persistent directories - name: create persistent directories
file: file:

17
puppet/services/database/redis-base.yaml
View File

@ -47,7 +47,7 @@ parameters:
type: boolean type: boolean
conditions: conditions:
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]} internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}
redis_ipv6: {get_param: RedisIPv6} redis_ipv6: {get_param: RedisIPv6}
outputs: outputs:
@ -69,7 +69,7 @@ outputs:
# proxy in front. # proxy in front.
redis::bind: redis::bind:
if: if:
- use_tls_proxy - internal_tls_enabled
- if: - if:
- redis_ipv6 - redis_ipv6
- '::1' - '::1'
@ -85,7 +85,7 @@ outputs:
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh' redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
redis::sentinel::sentinel_bind: redis::sentinel::sentinel_bind:
if: if:
- use_tls_proxy - internal_tls_enabled
- if: - if:
- redis_ipv6 - redis_ipv6
- '::1' - '::1'
@ -96,3 +96,14 @@ outputs:
params: params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]} $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
redis::ulimit: {get_param: RedisFDLimit} redis::ulimit: {get_param: RedisFDLimit}
metadata_settings:
if:
- internal_tls_enabled
-
- service: mysql
network: {get_param: [ServiceNetMap, MysqlNetwork]}
type: vip
- service: mysql
network: {get_param: [ServiceNetMap, MysqlNetwork]}
type: node
- null

12
puppet/services/database/redis.yaml
View File

@ -35,7 +35,7 @@ parameters:
default: false default: false
conditions: conditions:
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]} internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}
resources: resources:
@ -73,7 +73,7 @@ outputs:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]} $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
tripleo::profile::base::database::redis::tls_proxy_port: 6379 tripleo::profile::base::database::redis::tls_proxy_port: 6379
- if: - if:
- use_tls_proxy - internal_tls_enabled
- tripleo::redis::service_certificate: '/etc/pki/tls/certs/redis.crt' - tripleo::redis::service_certificate: '/etc/pki/tls/certs/redis.crt'
redis_certificate_specs: redis_certificate_specs:
service_certificate: '/etc/pki/tls/certs/redis.crt' service_certificate: '/etc/pki/tls/certs/redis.crt'
@ -93,13 +93,7 @@ outputs:
step_config: | step_config: |
include ::tripleo::profile::base::database::redis include ::tripleo::profile::base::database::redis
metadata_settings: metadata_settings:
if: get_attr: [RedisBase, role_data, metadata_settings]
- use_tls_proxy
-
- service: redis
network: {get_param: [ServiceNetMap, RabbitmqNetwork]}
type: vip
- null
upgrade_tasks: upgrade_tasks:
- name: Check if redis is deployed - name: Check if redis is deployed
command: systemctl is-enabled redis command: systemctl is-enabled redis