From 213c9a151f907988b283e4223404d0a09a5d4aa3 Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 28 Mar 2017 14:32:28 +0000 Subject: [PATCH] Remove installation of keystone policy file As of Id6e3c0ac54b21d85e68625a5b52fe2559fb70f24 keystone's policy file is empty and it is no longer required at runtime. This commit updates devstack to not deploy a policy file for keystone because devstack doesn't specify any policy overrides. Instead, we can remove the sample policy file and rely on the defaults that have been registered in code. This is the same approach nova took with policy in I85a251376dfe38caa4b100861bf764014a98bc37. Change-Id: Ib1d9a51a78e2a84a3d7294dc8782605a681fa9e8 --- lib/keystone | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/keystone b/lib/keystone index 530f3b42d9..ea33abae96 100644 --- a/lib/keystone +++ b/lib/keystone @@ -202,7 +202,6 @@ function configure_keystone { if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then install -m 600 $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF - cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI" fi