openstack/devstack
Code Issues Proposed changes

Merge "Ensures that Quantum sets the correct signing directory"

Browse Source
This commit is contained in:
Jenkins 2012-11-29 18:16:28 +00:00 committed by Gerrit Code Review
commit 318408c9a8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/quantum
View File

@ -6,6 +6,7 @@ XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
export QUANTUM_TEST_CONFIG_FILE=${QUANTUM_TEST_CONFIG_FILE:-"/etc/quantum/debug.ini"} 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 # Configures keystone integration for quantum service and agents
function quantum_setup_keystone() { 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_tenant_name $SERVICE_TENANT_NAME
iniset $conf_file $section admin_user $Q_ADMIN_USERNAME iniset $conf_file $section admin_user $Q_ADMIN_USERNAME
iniset $conf_file $section admin_password $SERVICE_PASSWORD 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() { function quantum_setup_ovs_bridge() {