openstack/devstack
Code Issues Proposed changes

Fix test for creating ceilometer conf dir

Browse Source 
Fix the test run before the ceilometer configuration
directory is created so that the dir is made if
it does not exist.

Change-Id: I2d6acd4fe7959f976ce99582aed69a49fc3f212e
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2012-09-22 10:52:31 -04:00
parent 9dce274dac
commit c5259b4ab5
2 changed files with 4 additions and 3 deletions

4
lib/ceilometer

@ -48,10 +48,10 @@ function cleanup_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 $USER $CEILOMETER_CONF_DIR
[ ! -d $CEILOMETER_API_LOG_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR
[ ! -d $CEILOMETER_API_LOG_DIR ] && sudo mkdir -m 755 -p $CEILOMETER_API_LOG_DIR
sudo chown $USER $CEILOMETER_API_LOG_DIR
# ceilometer confs are copy of /etc/nova/nova.conf which must exist first

3
stack.sh

@ -2222,8 +2222,9 @@ if is_service_enabled cinder; then
start_cinder
fi
if is_service_enabled ceilometer; then
echo_summary "Starting Ceilometer"
echo_summary "Configuring Ceilometer"
configure_ceilometer
echo_summary "Starting Ceilometer"
start_ceilometer
fi
screen_it horizon "cd $HORIZON_DIR && sudo tail -f /var/log/$APACHE_NAME/horizon_error.log"