Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move glance::api::show_multiple_locations within GlanceApi"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
pacemaker
/
rabbitmq.yaml
diff --git
a/docker/services/pacemaker/rabbitmq.yaml
b/docker/services/pacemaker/rabbitmq.yaml
index
7f6ac70
..
ab1a612
100644
(file)
--- a/
docker/services/pacemaker/rabbitmq.yaml
+++ b/
docker/services/pacemaker/rabbitmq.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-rabbitmq:latest'
type: string
description: image
default: 'centos-binary-rabbitmq:latest'
type: string
+ DockerRabbitmqConfigImage:
+ description: The container image to use for the rabbitmq config_volume
+ default: 'centos-binary-rabbitmq:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-72,7
+76,10
@@
outputs:
config_volume: rabbitmq
puppet_tags: file
step_config: *step_config
config_volume: rabbitmq
puppet_tags: file
step_config: *step_config
- config_image: *rabbitmq_image
+ config_image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
command: /usr/sbin/pacemaker_remoted
kolla_config:
/var/lib/kolla/config_files/rabbitmq.json:
command: /usr/sbin/pacemaker_remoted