Browse Source

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

tags/8.4.1
Zuul 2 months ago
parent
commit
8dcb25878d

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

@@ -198,16 +198,6 @@ outputs:
198 198
                 - {}
199 199
       metadata_settings:
200 200
         get_attr: [RedisBase, role_data, metadata_settings]
201
-        if:
202
-          - internal_tls_enabled
203
-          -
204
-            - service: redis
205
-              network: {get_param: [ServiceNetMap, RedisNetwork]}
206
-              type: vip
207
-            - service: redis
208
-              network: {get_param: [ServiceNetMap, RedisNetwork]}
209
-              type: node
210
-          - null
211 201
       host_prep_tasks:
212 202
         - name: create persistent directories
213 203
           file:

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

@@ -47,7 +47,7 @@ parameters:
47 47
     type: boolean
48 48
 
49 49
 conditions:
50
-  use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
50
+  internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}
51 51
   redis_ipv6: {get_param: RedisIPv6}
52 52
 
53 53
 outputs:
@@ -69,7 +69,7 @@ outputs:
69 69
         # proxy in front.
70 70
         redis::bind:
71 71
           if:
72
-          - use_tls_proxy
72
+          - internal_tls_enabled
73 73
           - if:
74 74
             - redis_ipv6
75 75
             - '::1'
@@ -85,7 +85,7 @@ outputs:
85 85
         redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
86 86
         redis::sentinel::sentinel_bind:
87 87
           if:
88
-          - use_tls_proxy
88
+          - internal_tls_enabled
89 89
           - if:
90 90
             - redis_ipv6
91 91
             - '::1'
@@ -96,3 +96,14 @@ outputs:
96 96
               params:
97 97
                 $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
98 98
         redis::ulimit: {get_param: RedisFDLimit}
99
+      metadata_settings:
100
+        if:
101
+          - internal_tls_enabled
102
+          -
103
+            - service: mysql
104
+              network: {get_param: [ServiceNetMap, MysqlNetwork]}
105
+              type: vip
106
+            - service: mysql
107
+              network: {get_param: [ServiceNetMap, MysqlNetwork]}
108
+              type: node
109
+          - null

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

@@ -35,7 +35,7 @@ parameters:
35 35
     default: false
36 36
 
37 37
 conditions:
38
-  use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
38
+  internal_tls_enabled: {equals : [{get_param: EnableInternalTLS}, true]}
39 39
 
40 40
 resources:
41 41
 
@@ -73,7 +73,7 @@ outputs:
73 73
                   $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
74 74
             tripleo::profile::base::database::redis::tls_proxy_port: 6379
75 75
           - if:
76
-            - use_tls_proxy
76
+            - internal_tls_enabled
77 77
             - tripleo::redis::service_certificate: '/etc/pki/tls/certs/redis.crt'
78 78
               redis_certificate_specs:
79 79
                 service_certificate: '/etc/pki/tls/certs/redis.crt'
@@ -93,13 +93,7 @@ outputs:
93 93
       step_config: |
94 94
         include ::tripleo::profile::base::database::redis
95 95
       metadata_settings:
96
-        if:
97
-          - use_tls_proxy
98
-          -
99
-            - service: redis
100
-              network: {get_param: [ServiceNetMap, RabbitmqNetwork]}
101
-              type: vip
102
-          - null
96
+        get_attr: [RedisBase, role_data, metadata_settings]
103 97
       upgrade_tasks:
104 98
         - name: Check if redis is deployed
105 99
           command: systemctl is-enabled redis

Loading…
Cancel
Save