Browse Source

Merge "Remove duplicate mount in rabbit containers"

tags/12.0.0
Zuul 2 weeks ago
parent
commit
b82bab09c9
3 changed files with 0 additions and 25 deletions
  1. +0
    -10
      deployment/rabbitmq/rabbitmq-container-puppet.yaml
  2. +0
    -5
      deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml
  3. +0
    -10
      deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml

+ 0
- 10
deployment/rabbitmq/rabbitmq-container-puppet.yaml View File

@@ -274,11 +274,6 @@ outputs:
- if:
- internal_tls_enabled
-
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
- /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
- null
@@ -313,11 +308,6 @@ outputs:
- if:
- internal_tls_enabled
-
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
- /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
- null

+ 0
- 5
deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml View File

@@ -218,11 +218,6 @@ outputs:
- if:
- internal_tls_enabled
-
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
- /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
- null

+ 0
- 10
deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml View File

@@ -218,11 +218,6 @@ outputs:
- if:
- internal_tls_enabled
-
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
- /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
- null
@@ -258,11 +253,6 @@ outputs:
- if:
- internal_tls_enabled
-
- list_join:
- ':'
- - {get_param: InternalTLSCAFile}
- {get_param: InternalTLSCAFile}
- 'ro'
- /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
- /etc/pki/tls/private/rabbitmq.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/rabbitmq.key:ro
- null

Loading…
Cancel
Save