openstack/devstack
Code Issues Proposed changes

Move ceilometermiddleware installation to lib/swift

Browse Source 
lib/swift is where it is used so this makes the relationship more
clear and direct.

Change-Id: Ie6fc09e27a39295c92f0790856446edb7dedb995
This commit is contained in:
Chris Dent 2015-06-27 15:05:17 +01:00 committed by Ian Wienand
parent 52844a11dd
commit 1848b837e6
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ceilometer
View File

@ -360,16 +360,6 @@ function install_ceilometerclient {
fi fi
} }
# install_ceilometermiddleware() - Collect source and prepare
function install_ceilometermiddleware {
if use_library_from_git "ceilometermiddleware"; then
git_clone_by_name "ceilometermiddleware"
setup_dev_lib "ceilometermiddleware"
else
pip_install_gr ceilometermiddleware
fi
}
# start_ceilometer() - Start running processes, including screen # start_ceilometer() - Start running processes, including screen
function start_ceilometer { function start_ceilometer {
run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-agent-central --config-file $CEILOMETER_CONF" run_process ceilometer-acentral "$CEILOMETER_BIN_DIR/ceilometer-agent-central --config-file $CEILOMETER_CONF"

15
lib/swift
View File

@ -697,6 +697,21 @@ function install_swiftclient {
fi fi
} }
# install_ceilometermiddleware() - Collect source and prepare
# note that this doesn't really have anything to do with ceilometer;
# though ceilometermiddleware has ceilometer in its name as an
# artifact of history, it is not a ceilometer specific tool. It
# simply generates pycadf-based notifications about requests and
# responses on the swift proxy
function install_ceilometermiddleware {
if use_library_from_git "ceilometermiddleware"; then
git_clone_by_name "ceilometermiddleware"
setup_dev_lib "ceilometermiddleware"
else
pip_install_gr ceilometermiddleware
fi
}
# start_swift() - Start running processes, including screen # start_swift() - Start running processes, including screen
function start_swift { function start_swift {
# (re)start memcached to make sure we have a clean memcache. # (re)start memcached to make sure we have a clean memcache.