Refactoring add ceilometer haas