openstack/cloudkitty
Code Issues Proposed changes

Fixed devstack not creating folder for tooz locks

Browse Source 
Change-Id: I6f0f2703b4d23ab9722ecbb3f2137b793f4bf8f7
This commit is contained in:
Stéphane Albert 2016-03-25 13:36:18 +01:00
parent f7e0a96b89
commit 1a9c279236
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/plugin.sh
View File

@ -146,6 +146,18 @@ function create_cloudkitty_cache_dir {
rm -f $CLOUDKITTY_AUTH_CACHE_DIR/registry/* rm -f $CLOUDKITTY_AUTH_CACHE_DIR/registry/*
} }
# create_cloudkitty_data_dir() - Part of the init_cloudkitty() process
function create_cloudkitty_data_dir {
# Create data dir
sudo mkdir -p $CLOUDKITTY_DATA_DIR
sudo chown $STACK_USER $CLOUDKITTY_DATA_DIR
rm -f $CLOUDKITTY_DATA_DIR/*
# Create locks dir
sudo mkdir -p $CLOUDKITTY_DATA_DIR/locks
sudo chown $STACK_USER $CLOUDKITTY_DATA_DIR/locks
rm -f $CLOUDKITTY_DATA_DIR/locks/*
}
# init_cloudkitty() - Initialize CloudKitty database # init_cloudkitty() - Initialize CloudKitty database
function init_cloudkitty { function init_cloudkitty {
# Delete existing cache # Delete existing cache
@ -168,6 +180,7 @@ function init_cloudkitty {
$CLOUDKITTY_BIN_DIR/cloudkitty-storage-init $CLOUDKITTY_BIN_DIR/cloudkitty-storage-init
create_cloudkitty_cache_dir create_cloudkitty_cache_dir
create_cloudkitty_data_dir
} }
# install_cloudkitty() - Collect source and prepare # install_cloudkitty() - Collect source and prepare

1
devstack/settings
View File

@ -11,6 +11,7 @@ CLOUDKITTY_CONF_DIR=/etc/cloudkitty
CLOUDKITTY_CONF=$CLOUDKITTY_CONF_DIR/cloudkitty.conf CLOUDKITTY_CONF=$CLOUDKITTY_CONF_DIR/cloudkitty.conf
CLOUDKITTY_API_LOG_DIR=/var/log/cloudkitty CLOUDKITTY_API_LOG_DIR=/var/log/cloudkitty
CLOUDKITTY_AUTH_CACHE_DIR=${CLOUDKITTY_AUTH_CACHE_DIR:-/var/cache/cloudkitty} CLOUDKITTY_AUTH_CACHE_DIR=${CLOUDKITTY_AUTH_CACHE_DIR:-/var/cache/cloudkitty}
CLOUDKITTY_DATA_DIR=${CLOUDKITTY_DATA_DIR:-/var/lib/cloudkitty}
CLOUDKITTY_REPORTS_DIR=${DATA_DIR}/cloudkitty/reports CLOUDKITTY_REPORTS_DIR=${DATA_DIR}/cloudkitty/reports
# Horizon enabled file # Horizon enabled file