Browse code

Merge "Disable glance v1 by default"

Jenkins authored on 2017/03/13 21:56:28
Showing 1 changed files
... ...
@@ -57,7 +57,7 @@ GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json
57 57
 GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf
58 58
 GLANCE_GLARE_CONF=$GLANCE_CONF_DIR/glance-glare.conf
59 59
 GLANCE_GLARE_PASTE_INI=$GLANCE_CONF_DIR/glance-glare-paste.ini
60
-GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-True}
60
+GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-False}
61 61
 
62 62
 if is_ssl_enabled_service "glance" || is_service_enabled tls-proxy; then
63 63
     GLANCE_SERVICE_PROTOCOL="https"