openstack/devstack
Code Issues Proposed changes

Merge "Create signing_dir for ceilometer."

Browse Source
This commit is contained in:
Jenkins 2013-01-10 09:23:51 +00:00 committed by Gerrit Code Review
commit 5e266052df
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ceilometer
View File

@ -33,6 +33,7 @@ CEILOMETERCLIENT_DIR=$DEST/python-ceilometerclient
CEILOMETER_CONF_DIR=/etc/ceilometer CEILOMETER_CONF_DIR=/etc/ceilometer
CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf CEILOMETER_CONF=$CEILOMETER_CONF_DIR/ceilometer.conf
CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api
CEILOMETER_AUTH_CACHE_DIR=${CEILOMETER_AUTH_CACHE_DIR:-/var/cache/ceilometer}
# Support potential entry-points console scripts # Support potential entry-points console scripts
if [ -d $CEILOMETER_DIR/bin ] ; then if [ -d $CEILOMETER_DIR/bin ] ; then
@ -84,10 +85,19 @@ function configure_ceilometer() {
iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer iniset $CEILOMETER_CONF keystone_authtoken admin_user ceilometer
iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD iniset $CEILOMETER_CONF keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME iniset $CEILOMETER_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $CEILOMETER_CONF keystone_authtoken signing_dir $CEILOMETER_AUTH_CACHE_DIR
cleanup_ceilometer cleanup_ceilometer
} }
# init_ceilometer() - Initialize etc.
function init_ceilometer() {
# Create cache dir
sudo mkdir -p $CEILOMETER_AUTH_CACHE_DIR
sudo chown `whoami` $CEILOMETER_AUTH_CACHE_DIR
rm -f $CEILOMETER_AUTH_CACHE_DIR/*
}
# install_ceilometer() - Collect source and prepare # install_ceilometer() - Collect source and prepare
function install_ceilometer() { function install_ceilometer() {
git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH

1
stack.sh
View File

@ -1221,6 +1221,7 @@ if is_service_enabled ceilometer; then
configure_ceilometer configure_ceilometer
configure_ceilometerclient configure_ceilometerclient
echo_summary "Starting Ceilometer" echo_summary "Starting Ceilometer"
init_ceilometer
start_ceilometer start_ceilometer
fi fi