From 2b741eb8703fd7886764107b05741c8415751991 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Fri, 19 Aug 2016 21:54:28 +0800
Subject: [PATCH] Create the nova instances directory when need during starting

The /var/lib/nova/instances should be create if it do not exist
during starting nova-compute container. Rather than create it
at the bootstrap service stage.

Change-Id: Ibcc5fb8eec0b38cf2b4313f48d1beb3ba83b1e85
Closes-Bug: #1614970
---
 .../roles/nova/tasks/bootstrap_service.yml    | 33 -------------------
 docker/nova/nova-compute/extend_start.sh      |  5 +--
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml
index c3bcebf7db..33ce56728e 100644
--- a/ansible/roles/nova/tasks/bootstrap_service.yml
+++ b/ansible/roles/nova/tasks/bootstrap_service.yml
@@ -18,36 +18,3 @@
       - "kolla_logs:/var/log/kolla/"
   run_once: True
   delegate_to: "{{ groups['nova-api'][0] }}"
-
-- name: Creating nova-compute volume
-  kolla_docker:
-    action: "create_volume"
-    common_options: "{{ docker_common_options }}"
-    name: "nova_compute"
-  register: nova_compute_volume
-  when:
-    - inventory_hostname in groups['compute']
-    - not enable_nova_fake | bool
-
-- name: Running Nova compute bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ nova_compute_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_nova_compute"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/nova-compute/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-      - "nova_compute:/var/lib/nova/"
-  when:
-    - inventory_hostname in groups['compute']
-    - not enable_nova_fake | bool
-    - nova_compute_volume.changed
diff --git a/docker/nova/nova-compute/extend_start.sh b/docker/nova/nova-compute/extend_start.sh
index 76226cd905..a458625ec6 100644
--- a/docker/nova/nova-compute/extend_start.sh
+++ b/docker/nova/nova-compute/extend_start.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+if [[ ! -d /var/lib/nova/instances ]]; then
     mkdir -p /var/lib/nova/instances
-    exit 0
 fi