openstack/devstack
Code Issues Proposed changes

Merge "Clear out the keystone pki data for each run"

Browse Source
This commit is contained in:
Jenkins 2012-12-18 13:13:50 +00:00 committed by Gerrit Code Review
commit d22dd9c06c
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/cinder
View File

@ -253,6 +253,7 @@ function init_cinder() {
# Create cache dir # Create cache dir
sudo mkdir -p $CINDER_AUTH_CACHE_DIR sudo mkdir -p $CINDER_AUTH_CACHE_DIR
sudo chown `whoami` $CINDER_AUTH_CACHE_DIR sudo chown `whoami` $CINDER_AUTH_CACHE_DIR
rm -f $CINDER_AUTH_CACHE_DIR/*
} }
# install_cinder() - Collect source and prepare # install_cinder() - Collect source and prepare

2
lib/glance
View File

@ -162,8 +162,10 @@ function init_glance() {
# Create cache dir # Create cache dir
sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/api sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/api
sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/api sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/api
rm -f $GLANCE_AUTH_CACHE_DIR/api/*
sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/registry sudo mkdir -p $GLANCE_AUTH_CACHE_DIR/registry
sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/registry sudo chown `whoami` $GLANCE_AUTH_CACHE_DIR/registry
rm -f $GLANCE_AUTH_CACHE_DIR/registry/*
} }
# install_glanceclient() - Collect source and prepare # install_glanceclient() - Collect source and prepare

2
lib/keystone
View File

@ -259,11 +259,13 @@ function init_keystone() {
if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" ]]; then
# Set up certificates # Set up certificates
rm -rf $KEYSTONE_CONF_DIR/ssl
$KEYSTONE_DIR/bin/keystone-manage pki_setup $KEYSTONE_DIR/bin/keystone-manage pki_setup
# Create cache dir # Create cache dir
sudo mkdir -p $KEYSTONE_AUTH_CACHE_DIR sudo mkdir -p $KEYSTONE_AUTH_CACHE_DIR
sudo chown `whoami` $KEYSTONE_AUTH_CACHE_DIR sudo chown `whoami` $KEYSTONE_AUTH_CACHE_DIR
rm -f $KEYSTONE_AUTH_CACHE_DIR/*
fi fi
} }

1
lib/nova
View File

@ -435,6 +435,7 @@ function init_nova() {
# Create cache dir # Create cache dir
sudo mkdir -p $NOVA_AUTH_CACHE_DIR sudo mkdir -p $NOVA_AUTH_CACHE_DIR
sudo chown `whoami` $NOVA_AUTH_CACHE_DIR sudo chown `whoami` $NOVA_AUTH_CACHE_DIR
rm -f $NOVA_AUTH_CACHE_DIR/*
} }
# install_novaclient() - Collect source and prepare # install_novaclient() - Collect source and prepare

1
lib/quantum
View File

@ -127,6 +127,7 @@ function quantum_setup_keystone() {
# Create cache dir # Create cache dir
sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR sudo mkdir -p $QUANTUM_AUTH_CACHE_DIR
sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR sudo chown `whoami` $QUANTUM_AUTH_CACHE_DIR
rm -f $QUANTUM_AUTH_CACHE_DIR/*
} }
function quantum_setup_ovs_bridge() { function quantum_setup_ovs_bridge() {