openstack/devstack
Code Issues Proposed changes

Merge "Fix install_ceilometer and install_ceilometerclient"

Browse Source
This commit is contained in:
Jenkins 2014-07-23 13:03:19 +00:00 committed by Gerrit Code Review
commit cd8da9307e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ceilometer
View File

@ -113,16 +113,8 @@ function cleanup_ceilometer {
fi fi
} }
# configure_ceilometerclient() - Set config files, create data dirs, etc
function configure_ceilometerclient {
setup_develop $CEILOMETERCLIENT_DIR
sudo install -D -m 0644 -o $STACK_USER {$CEILOMETERCLIENT_DIR/tools/,/etc/bash_completion.d/}ceilometer.bash_completion
}
# configure_ceilometer() - Set config files, create data dirs, etc # configure_ceilometer() - Set config files, create data dirs, etc
function configure_ceilometer { function configure_ceilometer {
setup_develop $CEILOMETER_DIR
[ ! -d $CEILOMETER_CONF_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_CONF_DIR [ ! -d $CEILOMETER_CONF_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_CONF_DIR
sudo chown $STACK_USER $CEILOMETER_CONF_DIR sudo chown $STACK_USER $CEILOMETER_CONF_DIR
@ -218,11 +210,15 @@ function init_ceilometer {
# 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
setup_develop $CEILOMETER_DIR
} }
# install_ceilometerclient() - Collect source and prepare # install_ceilometerclient() - Collect source and prepare
function install_ceilometerclient { function install_ceilometerclient {
git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH
setup_develop $CEILOMETERCLIENT_DIR
sudo install -D -m 0644 -o $STACK_USER {$CEILOMETERCLIENT_DIR/tools/,/etc/bash_completion.d/}ceilometer.bash_completion
} }
# start_ceilometer() - Start running processes, including screen # start_ceilometer() - Start running processes, including screen

1
stack.sh
View File

@ -802,7 +802,6 @@ if is_service_enabled ceilometer; then
install_ceilometer install_ceilometer
echo_summary "Configuring Ceilometer" echo_summary "Configuring Ceilometer"
configure_ceilometer configure_ceilometer
configure_ceilometerclient
fi fi
if is_service_enabled heat; then if is_service_enabled heat; then