commit 700ec602f6abbd726b81298149182a207fc13c54
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue May 21 14:05:36 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue May 21 14:05:36 2019 +0000
tree 606dee399065da6870cfe6e717411dafe0bda492
parent dc8a469cfa07dabb30f09673a0f83fe5f0c126a5
parent 2f37fe71b79141d87e8d2fcfbdc574f4ffe6c994

Merge "`show_multiple_locations` default was removed." into release/proposed/2019.2.0

glance/control/cluster.yml

diff --git a/glance/control/cluster.yml b/glance/control/cluster.yml
index a75f8c5..3eb7866 100644
--- a/glance/control/cluster.yml
+++ b/glance/control/cluster.yml
@@ -82,4 +82,3 @@
       storage:
         engine: file
       images: []
-      show_multiple_locations: True

glance/control/single.yml

diff --git a/glance/control/single.yml b/glance/control/single.yml
index ee2ae1a..24e9c3f 100644
--- a/glance/control/single.yml
+++ b/glance/control/single.yml
@@ -31,7 +31,6 @@
         protocol: ${_param:internal_protocol}
       registry:
         protocol: ${_param:internal_protocol}
-      show_multiple_locations: True
       barbican:
         enabled: ${_param:barbican_integration_enabled}
       message_queue: