openstack/devstack
Code Issues Proposed changes

Fix ceilometer-acompute rejoin problems

Browse Source 
The problem was in the screenrc file generated, where the
following command appeared:

sg libvirtd "ceilometer-agent-compute
                 --config-file /etc/ceilometer/ceilometer.conf"^M"

The final "^M" was not then parsed.

Change-Id: Ie6c5b1c9e3d196a3a9c343c2afb46435711c10f5
Closes-bug: #1311666
This commit is contained in:
Dina Belova 2014-04-23 17:47:36 +04:00
parent 17f52dcd8b
commit 0f6d4537e1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ceilometer
View File

@ -236,7 +236,7 @@ function install_ceilometerclient {
# start_ceilometer() - Start running processes, including screen # start_ceilometer() - Start running processes, including screen
function start_ceilometer { function start_ceilometer {
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
screen_it ceilometer-acompute "cd ; sg $LIBVIRT_GROUP \"ceilometer-agent-compute --config-file $CEILOMETER_CONF\"" screen_it ceilometer-acompute "cd ; sg $LIBVIRT_GROUP 'ceilometer-agent-compute --config-file $CEILOMETER_CONF'"
fi fi
if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
screen_it ceilometer-acompute "cd ; ceilometer-agent-compute --config-file $CEILOMETER_CONF" screen_it ceilometer-acompute "cd ; ceilometer-agent-compute --config-file $CEILOMETER_CONF"