Merge "Rabbitmq bootstrap enhancement"

ansible/roles/rabbitmq/defaults/main.yml

@@ -7,6 +7,11 @@ rabbitmq_services:
     group: "{{ role_rabbitmq_groups }}"
     enabled: true
     image: "{{ rabbitmq_image_full }}"
+    bootstrap_environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+      RABBITMQ_CLUSTER_COOKIE: "{{ role_rabbitmq_cluster_cookie }}"
+      RABBITMQ_LOG_DIR: "/var/log/kolla/{{ project_name }}"
     environment:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
       RABBITMQ_CLUSTER_COOKIE: "{{ role_rabbitmq_cluster_cookie }}"

ansible/roles/rabbitmq/tasks/bootstrap.yml

@@ -7,22 +7,18 @@
   register: rabbitmq_volume
 
 - name: Running RabbitMQ bootstrap container
+  vars:
+    service_name: "rabbitmq"
+    service: "{{ rabbitmq_services[service_name] }}"
   kolla_docker:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
-    environment:
+    environment: "{{ service.bootstrap_environment }}"
-      KOLLA_BOOTSTRAP:
+    image: "{{ service.image }}"
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-      RABBITMQ_CLUSTER_COOKIE: "{{ role_rabbitmq_cluster_cookie }}"
-      RABBITMQ_LOG_DIR: "/var/log/kolla/{{ project_name }}"
-    image: "{{ rabbitmq_image_full }}"
     labels:
       BOOTSTRAP:
     name: "{{ project_name }}_bootstrap"
     restart_policy: "never"
-    volumes:
+    volumes: "{{ service.volumes }}"
-      - "{{ node_config_directory }}/{{ project_name }}/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "{{ project_name }}:/var/lib/rabbitmq/"
   when: rabbitmq_volume | changed