Merge "Add openstack_node_role to ceilometer new classes"