openstack/devstack
Code Issues Proposed changes

Merge "Add ceilometer client in devstack"

Browse Source
This commit is contained in:
Jenkins 2013-01-10 09:02:32 +00:00 committed by Gerrit Code Review
commit 494393b871
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ceilometer
View File

@ -29,6 +29,7 @@ set +o xtrace
# Set up default directories # Set up default directories
CEILOMETER_DIR=$DEST/ceilometer CEILOMETER_DIR=$DEST/ceilometer
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
@ -46,6 +47,11 @@ function cleanup_ceilometer() {
mongo ceilometer --eval "db.dropDatabase();" mongo ceilometer --eval "db.dropDatabase();"
} }
# configure_ceilometerclient() - Set config files, create data dirs, etc
function configure_ceilometerclient() {
setup_develop $CEILOMETERCLIENT_DIR
}
# 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 setup_develop $CEILOMETER_DIR
@ -87,6 +93,11 @@ function install_ceilometer() {
git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH git_clone $CEILOMETER_REPO $CEILOMETER_DIR $CEILOMETER_BRANCH
} }
# install_ceilometerclient() - Collect source and prepare
function install_ceilometerclient() {
git_clone $CEILOMETERCLIENT_REPO $CEILOMETERCLIENT_DIR $CEILOMETERCLIENT_BRANCH
}
# start_ceilometer() - Start running processes, including screen # start_ceilometer() - Start running processes, including screen
function start_ceilometer() { function start_ceilometer() {
screen_it ceilometer-acompute "cd $CEILOMETER_DIR && sg libvirtd \"$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_CONF\"" screen_it ceilometer-acompute "cd $CEILOMETER_DIR && sg libvirtd \"$CEILOMETER_BIN_DIR/ceilometer-agent-compute --config-file $CEILOMETER_CONF\""

2
stack.sh
View File

@ -773,6 +773,7 @@ if is_service_enabled cinder; then
install_cinder install_cinder
fi fi
if is_service_enabled ceilometer; then if is_service_enabled ceilometer; then
install_ceilometerclient
install_ceilometer install_ceilometer
fi fi
if is_service_enabled tempest; then if is_service_enabled tempest; then
@ -1218,6 +1219,7 @@ fi
if is_service_enabled ceilometer; then if is_service_enabled ceilometer; then
echo_summary "Configuring Ceilometer" echo_summary "Configuring Ceilometer"
configure_ceilometer configure_ceilometer
configure_ceilometerclient
echo_summary "Starting Ceilometer" echo_summary "Starting Ceilometer"
start_ceilometer start_ceilometer
fi fi

4
stackrc
View File

@ -33,6 +33,10 @@ GIT_BASE=https://github.com
CEILOMETER_REPO=${GIT_BASE}/openstack/ceilometer.git CEILOMETER_REPO=${GIT_BASE}/openstack/ceilometer.git
CEILOMETER_BRANCH=master CEILOMETER_BRANCH=master
# ceilometer client library
CEILOMETERCLIENT_REPO=${GIT_BASE}/openstack/python-ceilometerclient
CEILOMETERCLIENT_BRANCH=master
# volume service # volume service
CINDER_REPO=${GIT_BASE}/openstack/cinder CINDER_REPO=${GIT_BASE}/openstack/cinder
CINDER_BRANCH=master CINDER_BRANCH=master