Browse code
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
Zane Bitter authored on 2019/11/15 04:01:27Showing 1 changed files
| ... | ... |
@@ -52,7 +52,6 @@ GLANCE_API_CONF=$GLANCE_CONF_DIR/glance-api.conf |
| 52 | 52 |
GLANCE_REGISTRY_PASTE_INI=$GLANCE_CONF_DIR/glance-registry-paste.ini |
| 53 | 53 |
GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini |
| 54 | 54 |
GLANCE_CACHE_CONF=$GLANCE_CONF_DIR/glance-cache.conf |
| 55 |
-GLANCE_POLICY_JSON=$GLANCE_CONF_DIR/policy.json |
|
| 56 | 55 |
GLANCE_SCHEMA_JSON=$GLANCE_CONF_DIR/schema-image.json |
| 57 | 56 |
GLANCE_SWIFT_STORE_CONF=$GLANCE_CONF_DIR/glance-swift-store.conf |
| 58 | 57 |
GLANCE_IMAGE_IMPORT_CONF=$GLANCE_CONF_DIR/glance-image-import.conf |
| ... | ... |
@@ -220,7 +219,6 @@ function configure_glance {
|
| 220 | 220 |
iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties ignore_user_roles admin |
| 221 | 221 |
iniset $GLANCE_IMAGE_IMPORT_CONF inject_metadata_properties inject |
| 222 | 222 |
|
| 223 |
- cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON |
|
| 224 | 223 |
cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON |
| 225 | 224 |
|
| 226 | 225 |
cp -p $GLANCE_DIR/etc/metadefs/*.json $GLANCE_METADEF_DIR |