|
...
|
...
|
@@ -56,6 +56,7 @@ GLANCE_CACHE_CONF=$GLANCE_CONF_DIR/glance-cache.conf
|
|
56
|
56
|
GLANCE_POLICY_JSON=$GLANCE_CONF_DIR/policy.json
|
|
57
|
57
|
GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json
|
|
58
|
58
|
GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf
|
|
|
59
|
+GLANCE_IMAGE_IMPORT_CONF=$GLANCE_CONF_DIR/glance-image-import.conf
|
|
59
|
60
|
GLANCE_V1_ENABLED=${GLANCE_V1_ENABLED:-False}
|
|
60
|
61
|
|
|
61
|
62
|
if is_service_enabled tls-proxy; then
|
|
...
|
...
|
@@ -232,6 +233,11 @@ function configure_glance {
|
|
232
|
232
|
# Store specific confs
|
|
233
|
233
|
iniset $GLANCE_CACHE_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/
|
|
234
|
234
|
|
|
|
235
|
+ # Set default configuration options for the glance-image-import
|
|
|
236
|
+ iniset $GLANCE_IMAGE_IMPORT_CONF image_import_opts image_import_plugins []
|
|
|
237
|
+ iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties ignore_user_roles admin
|
|
|
238
|
+ iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties inject
|
|
|
239
|
+
|
|
235
|
240
|
cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON
|
|
236
|
241
|
cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON
|
|
237
|
242
|
|