diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e1758c..a1b4ec4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ openstack-metering Cookbook CHANGELOG This file is used to list changes made in each version of the openstack-metering cookbook. +v7.0.2 +------ +### Improvement +- Add optional host to the ceilometer.conf + v7.0.1 ------ ### Bug diff --git a/metadata.rb b/metadata.rb index e7eef10..0285808 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email "cookbooks@lists.tfoundry.com" license "Apache 2.0" description "The OpenStack Metering service Ceilometer." long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "7.0.1" +version "7.0.2" recipe "openstack-metering::agent-central", "Installs agent central service." recipe "openstack-metering::agent-compute", "Installs agent compute service." diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb index 8a8a2a1..d629b44 100644 --- a/templates/default/ceilometer.conf.erb +++ b/templates/default/ceilometer.conf.erb @@ -1,4 +1,7 @@ [DEFAULT] +<% if node["openstack"]["metering"]["host"] %> +host = <%= node["openstack"]["metering"]["host"] %> +<% end %> os_auth_url = <%= @auth_uri %> os_tenant_name = <%= @service_tenant_name %> os_password = <%= @service_pass %>