Merge "Run cluster check on nodes configured in wsrep_cluster_address."

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

diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index cea3d8a..341ec3d 100644 (file)
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -46,16 +46,18 @@ outputs:
     value:
       service_name: {get_attr: [RabbitmqBase, role_data, service_name]}
       config_settings: {get_attr: [RabbitmqBase, role_data, config_settings]}
-      step_config: {get_attr: [RabbitmqBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [RabbitmqBase, role_data, step_config]
       service_config_settings: {get_attr: [RabbitmqBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
-      docker_image: &rabbitmq_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
-      puppet_tags: file
-      config_volume: rabbitmq
-      config_image: *rabbitmq_image
+      puppet_config:
+        config_volume: rabbitmq
+        puppet_tags: file
+        step_config: *step_config
+        config_image: &rabbitmq_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerRabbitmqImage} ]
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/lib/rabbitmq/bin/rabbitmq-server
@@ -88,7 +90,7 @@ outputs:
               - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-              - rabbitmq:/var/lib/rabbitmq/
+              - /var/lib/rabbitmq:/var/lib/rabbitmq
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
               - KOLLA_BOOTSTRAP=True
@@ -114,6 +116,15 @@ outputs:
               - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
               - /etc/hosts:/etc/hosts:ro
               - /etc/localtime:/etc/localtime:ro
-              - rabbitmq:/var/lib/rabbitmq/
+              - /var/lib/rabbitmq:/var/lib/rabbitmq
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create /var/lib/rabbitmq
+          file:
+            path: /var/lib/rabbitmq
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable rabbitmq service
+          tags: step2
+          service: name=rabbitmq-server state=stopped enabled=no