From 537912778d8c79ffe54930612077e2bea72de737 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Mon, 19 Oct 2015 16:50:43 +0100
Subject: [PATCH] Only bind mount images dir /w local Glance storage

/var/lib/images should not be bind mounted unless:
The glance server is not on metal
Is using local file storage
Isn't using glance_nfs_client settings

This isn't required for non-file backed glance servers, and will cause
failures if /var/lib/images is bind mounted when using nfs_clients
for glance.

Closes-bug: #1503411
Change-Id: Ie90f75652a960af664fcf8f29d554045f0599944
---
 playbooks/os-glance-install.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/playbooks/os-glance-install.yml b/playbooks/os-glance-install.yml
index 07ebf5b245..e29137de97 100644
--- a/playbooks/os-glance-install.yml
+++ b/playbooks/os-glance-install.yml
@@ -36,7 +36,10 @@
         container_config:
           - "lxc.mount.entry=/openstack/{{ container_name }} var/lib/glance/images none bind 0 0"
       delegate_to: "{{ physical_host }}"
-      when: not is_metal | bool
+      when: >
+            (not is_metal | bool) and
+            (glance_default_store == "file") and
+            (glance_nfs_client is not defined)
       register: container_extra_config
       tags:
         - glance-cache-dir