Merge "Change the directory for httpd certs/keys to be service-specific"

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

diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml
index 573ec17..9d5a52a 100644 (file)
--- a/docker/services/rabbitmq.yaml
+++ b/docker/services/rabbitmq.yaml
@@ -61,23 +61,6 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/rabbitmq.json:
           command: /usr/lib/rabbitmq/bin/rabbitmq-server
-          config_files:
-          - dest: /etc/rabbitmq/rabbitmq.config
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmq.config
-          - dest: /etc/rabbitmq/enabled_plugins
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/enabled_plugins
-          - dest: /etc/rabbitmq/rabbitmq-env.conf
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmq-env.conf
-          - dest: /etc/rabbitmq/rabbitmqadmin.conf
-            owner: root
-            perm: '0644'
-            source: /var/lib/kolla/config_files/src/etc/rabbitmq/rabbitmqadmin.conf
       docker_config:
         step_1:
           rabbitmq_bootstrap:
@@ -87,10 +70,10 @@ outputs:
             privileged: false
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/: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
@@ -113,12 +96,17 @@ outputs:
             restart: always
             volumes:
               - /var/lib/kolla/config_files/rabbitmq.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/rabbitmq/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/rabbitmq/etc/rabbitmq/:/etc/rabbitmq/: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