openstack/devstack
Code Issues Proposed changes

Merge "Move neutron cache dir into a function"

Browse Source
This commit is contained in:
Jenkins 2013-11-26 18:49:35 +00:00 committed by Gerrit Code Review
commit 9734405b99
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/neutron
View File

@ -17,6 +17,7 @@
# - configure_neutron_third_party # - configure_neutron_third_party
# - init_neutron_third_party # - init_neutron_third_party
# - start_neutron_third_party # - start_neutron_third_party
# - create_neutron_cache_dir
# - create_nova_conf_neutron # - create_nova_conf_neutron
# - start_neutron_service_and_check # - start_neutron_service_and_check
# - create_neutron_initial_network # - create_neutron_initial_network
@ -296,6 +297,14 @@ function create_nova_conf_neutron() {
fi fi
} }
# create_neutron_cache_dir() - Part of the _neutron_setup_keystone() process
function create_neutron_cache_dir() {
# Create cache dir
sudo mkdir -p $NEUTRON_AUTH_CACHE_DIR
sudo chown $STACK_USER $NEUTRON_AUTH_CACHE_DIR
rm -f $NEUTRON_AUTH_CACHE_DIR/*
}
# create_neutron_accounts() - Set up common required neutron accounts # create_neutron_accounts() - Set up common required neutron accounts
# Tenant User Roles # Tenant User Roles
@ -782,9 +791,7 @@ function _neutron_setup_keystone() {
if [[ -z $skip_auth_cache ]]; then if [[ -z $skip_auth_cache ]]; then
iniset $conf_file $section signing_dir $NEUTRON_AUTH_CACHE_DIR iniset $conf_file $section signing_dir $NEUTRON_AUTH_CACHE_DIR
# Create cache dir # Create cache dir
sudo mkdir -p $NEUTRON_AUTH_CACHE_DIR create_neutron_cache_dir
sudo chown $STACK_USER $NEUTRON_AUTH_CACHE_DIR
rm -f $NEUTRON_AUTH_CACHE_DIR/*
fi fi
} }