From 9343df160e29a4a5193503ed6cd0e35d1e590e59 Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Wed, 28 Nov 2012 10:05:53 +0000 Subject: [PATCH] Ensures that Quantum sets the correct signing directory Change-Id: I4f01a171f0ced73ba6b6000d225c8f5811f1874a --- lib/quantum | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/quantum b/lib/quantum index ba98b64635..373d5217f6 100644 --- a/lib/quantum +++ b/lib/quantum @@ -6,6 +6,7 @@ XTRACE=$(set +o | grep xtrace) set +o xtrace export QUANTUM_TEST_CONFIG_FILE=${QUANTUM_TEST_CONFIG_FILE:-"/etc/quantum/debug.ini"} +QUANTUM_AUTH_CACHE_DIR=${QUANTUM_AUTH_CACHE_DIR:-/var/cache/quantum} # Configures keystone integration for quantum service and agents function quantum_setup_keystone() { @@ -22,6 +23,12 @@ function quantum_setup_keystone() { iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME iniset $conf_file $section admin_user $Q_ADMIN_USERNAME iniset $conf_file $section admin_password $SERVICE_PASSWORD + if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then + iniset $conf_file $section signing_dir $QUANTUM_AUTH_CACHE_DIR + # Create cache dir + sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR + sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR + fi } function quantum_setup_ovs_bridge() {