openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

add 'debug' and 'verbose' attributes 

for ceilometer.conf.erb.

Change-Id: I4458922684df67738fdbd895e73babdf2f7bfb62
This commit is contained in:
Brett Campbell 2014-02-25 12:42:17 -08:00
parent 5ea68c53e0
commit b8e90a5c00
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -27,6 +27,8 @@ default['openstack']['metering']['conf_dir'] = '/etc/ceilometer'
default['openstack']['metering']['conf'] = ::File.join(node['openstack']['metering']['conf_dir'], 'ceilometer.conf')
default['openstack']['metering']['periodic_interval'] = 600
default['openstack']['metering']['syslog']['use'] = false
default['openstack']['metering']['verbose'] = 'true'
default['openstack']['metering']['debug'] = 'false'
default['openstack']['metering']['api']['auth']['cache_dir'] = '/var/cache/ceilometer/api'

13
templates/default/ceilometer.conf.erb
View File

@ -8,7 +8,11 @@ os_password = <%= @service_pass %>
os_username = <%= @service_user %>
policy_file = /etc/ceilometer/policy.json
database_connection = <%= @database_connection %>
verbose = True
verbose = <%= node["openstack"]["metering"]["verbose"] %>
debug = <%= node["openstack"]["metering"]["debug"] %>
<% if node["openstack"]["metering"]["syslog"]["use"] %>
log_config = /etc/openstack/logging.conf
<% end %>
notification_topics = notifications,glance_notifications
<% if node["openstack"]["mq"]["metering"]["service_type"] == "rabbitmq" %>
@ -45,13 +49,6 @@ qpid_tcp_nodelay=<%= node["openstack"]["mq"]["metering"]["qpid"]["tcp_nodelay"]
<% end %>
<% if node["openstack"]["metering"]["syslog"]["use"] %>
log_config = /etc/openstack/logging.conf
<% end %>
<% if node["openstack"]["metering"]["debug"] %>
debug = True
<% end %>
glance_registry_host = <%= @image_endpoint.host %>
periodic_interval = <%= node["openstack"]["metering"]["periodic_interval"] %>