From e5ee448ea8b9ea1651dfa7fe45a7f44b70e4caa1 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 22 May 2017 18:21:02 +0800
Subject: [PATCH] Mount cinder volume for cinder-volume and cinder-backup all
 the time

cinder-volume will convert the disk locally when boot image from volume
with create new volume. whereas the container only have 10G space in
default, cinder-volume will complain that no space if image is large.

This patch mount cinder volume for cinder-volume and cinder-backup all
the time.

Change-Id: I8c68ea49374dc67839699b81e345cfc390a01fe3
Close-Bug: #1692485
---
 ansible/roles/cinder/defaults/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index b4c7f789a0..9707cb9025 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -33,7 +33,7 @@ cinder_services:
       - "/dev/:/dev/"
       - "/lib/modules:/lib/modules:ro"
       - "/run/:/run/:shared"
-      - "{% if enable_iscsid | bool %}cinder:/var/lib/cinder{% endif %}"
+      - "cinder:/var/lib/cinder"
       - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
       - "kolla_logs:/var/log/kolla/"
   cinder-backup:
@@ -47,7 +47,7 @@ cinder_services:
       - "/etc/localtime:/etc/localtime:ro"
       - "/dev/:/dev/"
       - "/run/:/run/:shared"
-      - "{% if enable_iscsid | bool %}cinder:/var/lib/cinder{% endif %}"
+      - "cinder:/var/lib/cinder"
       - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
       - "kolla_logs:/var/log/kolla/"