Browse Source

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

tags/8.4.1
Zuul Gerrit Code Review 10 months ago
parent
commit
8dcb25878d
3 changed files with 17 additions and 22 deletions
  1. +0
    -10
      docker/services/database/redis.yaml
  2. +14
    -3
      puppet/services/database/redis-base.yaml
  3. +3
    -9
      puppet/services/database/redis.yaml

+ 0
- 10
docker/services/database/redis.yaml View File

@@ -198,16 +198,6 @@ outputs:
- {}
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:
- name: create persistent directories
file:


+ 14
- 3
puppet/services/database/redis-base.yaml View File

@@ -47,7 +47,7 @@ parameters:
type: boolean

conditions:
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}
redis_ipv6: {get_param: RedisIPv6}

outputs:
@@ -69,7 +69,7 @@ outputs:
# proxy in front.
redis::bind:
if:
- use_tls_proxy
- internal_tls_enabled
- if:
- redis_ipv6
- '::1'
@@ -85,7 +85,7 @@ outputs:
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
redis::sentinel::sentinel_bind:
if:
- use_tls_proxy
- internal_tls_enabled
- if:
- redis_ipv6
- '::1'
@@ -96,3 +96,14 @@ outputs:
params:
$NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
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

+ 3
- 9
puppet/services/database/redis.yaml View File

@@ -35,7 +35,7 @@ parameters:
default: false

conditions:
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}

resources:

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


Loading…
Cancel
Save