From 0e02e7fd55276678ba839a098896b6142363147c Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Thu, 14 Nov 2019 14:01:27 -0500 Subject: [PATCH] Don't install glance default policy With Glance defining default policies in code, it's no longer necessary to install policy.json from the repo. Change-Id: I9f9160f5a2bf9fd77fb3807e12de219b7a49952d Depends-On: https://review.opendev.org/693129 --- lib/glance | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/glance b/lib/glance index 54d3276433..740bcabf6a 100644 --- a/lib/glance +++ b/lib/glance @@ -52,7 +52,6 @@ GLANCE_API_CONF=$GLANCE_CONF_DIR/glance-api.conf GLANCE_REGISTRY_PASTE_INI=$GLANCE_CONF_DIR/glance-registry-paste.ini GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini GLANCE_CACHE_CONF=$GLANCE_CONF_DIR/glance-cache.conf -GLANCE_POLICY_JSON=$GLANCE_CONF_DIR/policy.json GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf GLANCE_IMAGE_IMPORT_CONF=$GLANCE_CONF_DIR/glance-image-import.conf @@ -220,7 +219,6 @@ function configure_glance { iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties ignore_user_roles admin iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties inject - cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON cp -p $GLANCE_DIR/etc/metadefs/*.json $GLANCE_METADEF_DIR