commit 21fcb028ec37ba85585caf45a86e8a691c260a76
author Jenkins <jenkins@review.openstack.org> Mon Mar 13 12:56:28 2017 +0000
committer Gerrit Code Review <review@openstack.org> Mon Mar 13 12:56:28 2017 +0000
tree 52e8b15bc6dee84467a3cfcae546a10c1b525bad
parent cb484abf80820c8a06ec605fd21275b0cac263b9
parent 80e82eac4cd127a68fceea37270d09f9cbd71c75

Merge "Disable glance v1 by default"

lib/glance

diff --git a/lib/glance b/lib/glance
index 0ba2cfa..6125f45 100644
--- a/lib/glance
+++ b/lib/glance
@@ -57,7 +57,7 @@
 GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf
 GLANCE_GLARE_CONF=$GLANCE_CONF_DIR/glance-glare.conf
 GLANCE_GLARE_PASTE_INI=$GLANCE_CONF_DIR/glance-glare-paste.ini
-GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-True}
+GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-False}
 
 if is_ssl_enabled_service "glance" || is_service_enabled tls-proxy; then
     GLANCE_SERVICE_PROTOCOL="https"