openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "RabbitMQ: Migrate environment/volumes definition"

This commit is contained in:
Zuul 2022-09-06 20:48:19 +00:00 committed by Gerrit Code Review
parent 443d0fe773 92ad83b1c8
commit 3407afc0e9
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
View File

@ -71,6 +71,9 @@ parameters:
description: >
Setting this to a unique value will re-run any deployment tasks which
perform configuration on a Heat stack-update.
EnableInternalTLS:
type: boolean
default: false
resources:
ContainersCommon:
@ -132,6 +135,20 @@ outputs:
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
tripleo::profile::pacemaker::rabbitmq_bundle::docker_volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:rw,z
- /var/log/containers/rabbitmq:/var/log/rabbitmq:rw,z
- if:
- {get_param: EnableInternalTLS}
- - /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
tripleo::profile::pacemaker::rabbitmq_bundle::docker_environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
LANG: 'en_US.UTF-8'
LC_ALL: 'en_US.UTF-8'
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config:

17
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
View File

@ -71,6 +71,9 @@ parameters:
description: >
Setting this to a unique value will re-run any deployment tasks which
perform configuration on a Heat stack-update.
EnableInternalTLS:
type: boolean
default: false
resources:
ContainersCommon:
@ -132,6 +135,20 @@ outputs:
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_control_port: 3122
tripleo::profile::pacemaker::rabbitmq_bundle::container_backend: {get_param: ContainerCli}
tripleo::profile::pacemaker::rabbitmq_bundle::docker_volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/rabbitmq:/var/lib/kolla/config_files/src:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:rw,z
- /var/log/containers/rabbitmq:/var/log/rabbitmq:rw,z
- if:
- {get_param: EnableInternalTLS}
- - /etc/pki/tls/certs/rabbitmq.crt:/var/lib/kolla/config_files/src-tls/etc/pki/tls/certs/rabbitmq.crt:ro
tripleo::profile::pacemaker::rabbitmq_bundle::docker_environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
LANG: en_US.UTF-8
LC_ALL: en_US.UTF-8
service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
puppet_config: