summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh3
-rw-r--r--devstack/settings1
2 files changed, 0 insertions, 4 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b0dd983d..f245f32c 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -190,9 +190,6 @@ function configure_trove {
# Copy api-paste file over to the trove conf dir
cp $TROVE_LOCAL_API_PASTE_INI $TROVE_API_PASTE_INI
- # Copy the default policy file over to the trove conf dir
- cp $TROVE_LOCAL_POLICY_JSON $TROVE_POLICY_JSON
-
# (Re)create trove conf files
rm -f $TROVE_CONF
rm -f $TROVE_TASKMANAGER_CONF
diff --git a/devstack/settings b/devstack/settings
index 45cd862c..1bd065be 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -21,7 +21,6 @@ TROVE_TASKMANAGER_CONF=${TROVE_TASKMANAGER_CONF:-${TROVE_CONF_DIR}/trove-taskman
TROVE_CONDUCTOR_CONF=${TROVE_CONDUCTOR_CONF:-${TROVE_CONF_DIR}/trove-conductor.conf}
TROVE_GUESTAGENT_CONF=${TROVE_GUESTAGENT_CONF:-${TROVE_CONF_DIR}/trove-guestagent.conf}
TROVE_API_PASTE_INI=${TROVE_API_PASTE_INI:-${TROVE_CONF_DIR}/api-paste.ini}
-TROVE_POLICY_JSON=${TROVE_POLICY_JSON:-${TROVE_CONF_DIR}/policy.json}
TROVE_LOCAL_CONF_DIR=${TROVE_LOCAL_CONF_DIR:-${TROVE_DIR}/etc/trove}
TROVE_LOCAL_API_PASTE_INI=${TROVE_LOCAL_API_PASTE_INI:-${TROVE_LOCAL_CONF_DIR}/api-paste.ini}