From c85e0464df491f3930d829a5780e63ccd2872e90 Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <chengsf@winhong.com>
Date: Wed, 12 Apr 2017 17:52:39 +0800
Subject: [PATCH] Remove show_multiple_locations in glance-api

This option is deprecated for removal since Newton.
This option will be removed in the Pike release or later because the
same functionality can be achieved with greater granularity by using policies.
Please see the Newton release notes for more information.

see:
https://docs.openstack.org/ocata/config-reference/image/glance-api.conf.html
https://docs.openstack.org/releasenotes/glance/newton.html

Change-Id: I54e090cb89cfeeb78b890e335cf4eeee45275fbf
Closes-Bug: #1682070
---
 ansible/roles/glance/templates/glance-api.conf.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index f60eaa843a..2e1c63e5c9 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -17,7 +17,6 @@ registry_host = {{ kolla_internal_fqdn }}
 
 {% if enable_ceph | bool %}
 show_image_direct_url= True
-show_multiple_locations = True
 {% endif %}
 
 cinder_catalog_info = volume:cinder:internalURL