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 "Adds service for OVS and enables ODL DPDK deployments"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
rabbitmq.yaml
diff --git
a/docker/services/rabbitmq.yaml
b/docker/services/rabbitmq.yaml
index
92c8d9f
..
06d663c
100644
(file)
--- a/
docker/services/rabbitmq.yaml
+++ b/
docker/services/rabbitmq.yaml
@@
-33,6
+33,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
RabbitCookie:
type: string
default: ''
RabbitCookie:
type: string
default: ''
@@
-88,6
+89,7
@@
outputs:
step_1:
rabbitmq_init_logs:
start_order: 0
step_1:
rabbitmq_init_logs:
start_order: 0
+ detach: false
image: *rabbitmq_image
privileged: false
user: root
image: *rabbitmq_image
privileged: false
user: root
@@
-96,6
+98,7
@@
outputs:
command: ['/bin/bash', '-c', 'chown -R rabbitmq:rabbitmq /var/log/rabbitmq']
rabbitmq_bootstrap:
start_order: 1
command: ['/bin/bash', '-c', 'chown -R rabbitmq:rabbitmq /var/log/rabbitmq']
rabbitmq_bootstrap:
start_order: 1
+ detach: false
image: *rabbitmq_image
net: host
privileged: false
image: *rabbitmq_image
net: host
privileged: false
@@
-145,7
+148,7
@@
outputs:
step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_image
volumes:
step_config: 'include ::tripleo::profile::base::rabbitmq'
config_image: *rabbitmq_image
volumes:
- - /var/lib/config-data/rabbitmq/etc/
:/etc/
+ - /var/lib/config-data/rabbitmq/etc/
rabbitmq/:/etc/rabbitmq/:ro
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro
host_prep_tasks:
- name: create persistent directories
- /var/lib/rabbitmq:/var/lib/rabbitmq:ro
host_prep_tasks:
- name: create persistent directories