Merge branch 'ceilometer_custom_image' of https://github.com/open-cloud/xos into ceilometer_custom_image