Merge "Playbook for Manila upgrade"

ansible/roles/manila/tasks/bootstrap.yml

@@ -35,21 +35,5 @@
   run_once: True
   delegate_to: "{{ groups['manila-api'][0] }}"
 
-- name: Running Manila bootstrap container
+- include: bootstrap_service.yml
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ manila_api_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_manila"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro"
-  run_once: True
-  delegate_to: "{{ groups['manila-api'][0] }}"
   when: database_created

ansible/roles/manila/tasks/bootstrap_service.yml

@@ -0,0 +1,19 @@
+---
+- name: Running Manila bootstrap container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    detach: False
+    environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    image: "{{ manila_api_image_full }}"
+    labels:
+      BOOTSTRAP:
+    name: "bootstrap_manila"
+    restart_policy: "never"
+    volumes:
+      - "{{ node_config_directory }}/manila-api/:{{ container_config_directory }}/:ro"
+      - "kolla_logs:/var/log/kolla/"
+  run_once: True
+  delegate_to: "{{ groups['manila-api'][0] }}"

ansible/roles/manila/tasks/upgrade.yml

@@ -1 +1,7 @@
 ---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+  serial: "30%"