Merge "Make ceilometer crontab removal idempotent"

[apex-tripleo-heat-templates.git] / docker / services / rabbitmq.yaml

diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index b6428fc..f42f2ed 100644 (file)
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -12,6 +12,10 @@ parameters:
     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
@@ -26,6 +30,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   RabbitCookie:
     type: string
     default: ''
@@ -42,6 +54,8 @@ resources:
       EndpointMap: {get_param: EndpointMap}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
@@ -63,10 +77,10 @@ outputs:
       puppet_config:
         config_volume: rabbitmq
         step_config: *step_config
-        config_image: &rabbitmq_image
+        config_image: &rabbitmq_config_image
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/lib/rabbitmq/bin/rabbitmq-server
@@ -79,7 +93,11 @@ outputs:
         step_1:
           rabbitmq_init_logs:
             start_order: 0
-            image: *rabbitmq_image
+            detach: false
+            image: &rabbitmq_image
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
             privileged: false
             user: root
             volumes:
@@ -87,6 +105,7 @@ outputs:
             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
@@ -134,9 +153,9 @@ outputs:
           config_volume: 'rabbit_init_tasks'
           puppet_tags: 'rabbitmq_policy,rabbitmq_user'
           step_config: 'include ::tripleo::profile::base::rabbitmq'
-          config_image: *rabbitmq_image
+          config_image: *rabbitmq_config_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