Allow override of default endpoint type in ceilometer.conf
Merge branch 'master' of github.com:fractalcat/cookbook-openstack-telemetry

Conflicts:
	attributes/default.rb
	templates/default/ceilometer.conf.erb