From 1468086891ed2807868bfaaa900b46b88bda23a4 Mon Sep 17 00:00:00 2001 From: "Luis A. Garcia" Date: Mon, 14 Apr 2014 10:39:41 -0700 Subject: [PATCH] Remove deprecated database_connection property Instead use the new 'connection' property under the [database] group. Change-Id: I4879803d38db954ef1d57777dd9be8545eb03769 --- templates/default/ceilometer.conf.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/default/ceilometer.conf.erb b/templates/default/ceilometer.conf.erb index 85a94ce..d0303bb 100644 --- a/templates/default/ceilometer.conf.erb +++ b/templates/default/ceilometer.conf.erb @@ -7,7 +7,6 @@ os_tenant_name = <%= @service_tenant_name %> os_password = <%= @service_pass %> os_username = <%= @service_user %> policy_file = /etc/ceilometer/policy.json -database_connection = <%= @database_connection %> verbose = <%= node["openstack"]["telemetry"]["verbose"] %> debug = <%= node["openstack"]["telemetry"]["debug"] %> <% if node["openstack"]["telemetry"]["hypervisor_inspector"] %> @@ -55,6 +54,9 @@ qpid_tcp_nodelay=<%= node["openstack"]["mq"]["telemetry"]["qpid"]["tcp_nodelay"] glance_registry_host = <%= @image_endpoint.host %> periodic_interval = <%= node["openstack"]["telemetry"]["periodic_interval"] %> +[database] +connection=<%= @database_connection %> + [keystone_authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory auth_uri = <%= @auth_uri %>