add ceilometer stuff from Ron