From 4ad8db71683915a771788815bf1894237975f982 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Mon, 9 Nov 2015 02:59:17 +0000
Subject: [PATCH] Remove unused cinder-data container

The cinder-data container serves no purpose and is not actually used
past the bootstrap container and should be removed.

Additionally add the missing '---' header to the start.yml file.

TrivialFix
Related-Bug: #1513598
Related-Bug: #1513439
Change-Id: I22b630bbee954e12a4de5652b7fb068669f633c5
---
 ansible/roles/cinder/tasks/bootstrap.yml | 18 ------------------
 ansible/roles/cinder/tasks/start.yml     |  1 +
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index cf8f434138..1c0790048d 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -27,22 +27,6 @@
   failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
   run_once: True
 
-- name: Starting Cinder data container
-  docker:
-    tty: True
-    net: host
-    pull: "{{ docker_pull_policy }}"
-    restart_policy: "{{ docker_restart_policy }}"
-    restart_policy_retry: "{{ docker_restart_policy_retry }}"
-    state: reloaded
-    registry: "{{ docker_registry }}"
-    username: "{{ docker_registry_username }}"
-    password: "{{ docker_registry_password }}"
-    insecure_registry: "{{ docker_insecure_registry }}"
-    name: cinder_data
-    image: "{{ cinder_data_image_full }}"
-    volumes: "/var/lib/cinder/"
-
 - name: Starting Cinder bootstrap container
   docker:
     tty: True
@@ -58,8 +42,6 @@
     name: bootstrap_cinder
     image: "{{ cinder_api_image_full }}"
     volumes: "{{ node_config_directory }}/cinder-api/:{{ container_config_directory }}/:ro"
-    volumes_from:
-     - cinder_data
     env:
       KOLLA_BOOTSTRAP:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml
index 563d3a558a..5c30315ef7 100644
--- a/ansible/roles/cinder/tasks/start.yml
+++ b/ansible/roles/cinder/tasks/start.yml
@@ -1,3 +1,4 @@
+---
 - name: Starting Cinder-api container
   docker:
     tty: True