From 54aa896735a9efc9a24eeb30732f91ec5b971d6d Mon Sep 17 00:00:00 2001
From: Allen Gao <wanlong.gao@easystack.cn>
Date: Tue, 2 Feb 2016 15:03:08 +0800
Subject: [PATCH] Playbook for upgrade murano

Change-Id: Iffb12c8e22724ba779e4ce80204710513875e725
Partially-Implements: blueprint upgrade-kolla
Implements: blueprint upgrade-murano
---
 ansible/roles/murano/tasks/bootstrap.yml        | 17 +----------------
 .../roles/murano/tasks/bootstrap_service.yml    | 17 +++++++++++++++++
 ansible/roles/murano/tasks/upgrade.yml          |  6 ++++++
 3 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 ansible/roles/murano/tasks/bootstrap_service.yml

diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml
index 0d07a0cec2..aafabbbb12 100644
--- a/ansible/roles/murano/tasks/bootstrap.yml
+++ b/ansible/roles/murano/tasks/bootstrap.yml
@@ -36,20 +36,5 @@
   run_once: True
   delegate_to: "{{ groups['murano-api'][0] }}"
 
-- name: Running Murano bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ murano_api_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_murano"
-    restart_policy: "never"
-    volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro"
-  run_once: True
-  delegate_to: "{{ groups['murano-api'][0] }}"
+- include: bootstrap_service.yml
   when: database_created
diff --git a/ansible/roles/murano/tasks/bootstrap_service.yml b/ansible/roles/murano/tasks/bootstrap_service.yml
new file mode 100644
index 0000000000..887f05cc56
--- /dev/null
+++ b/ansible/roles/murano/tasks/bootstrap_service.yml
@@ -0,0 +1,17 @@
+---
+- name: Running Murano bootstrap container
+  kolla_docker:
+    action: "start_container"
+    common_options: "{{ docker_common_options }}"
+    detach: False
+    environment:
+      KOLLA_BOOTSTRAP:
+      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
+    image: "{{ murano_api_image_full }}"
+    labels:
+      BOOTSTRAP:
+    name: "bootstrap_murano"
+    restart_policy: "never"
+    volumes: "{{ node_config_directory }}/murano-api/:{{ container_config_directory }}/:ro"
+  run_once: True
+  delegate_to: "{{ groups['murano-api'][0] }}"
diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml
index ed97d539c0..c0e3b19a40 100644
--- a/ansible/roles/murano/tasks/upgrade.yml
+++ b/ansible/roles/murano/tasks/upgrade.yml
@@ -1 +1,7 @@
 ---
+- include: config.yml
+
+- include: bootstrap_service.yml
+
+- include: start.yml
+  serial: "30%"