openstack/charm-ceilometer-agent
Code Issues Proposed changes

Tidy templates

Browse Source
This commit is contained in:
James Page
2013-12-17 15:21:46 +00:00
parent 4c59c6a149
commit 577c9d19f7
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
templates/grizzly/ceilometer.conf
View File

@@ -8,22 +8,22 @@
debug = {{ debug }} debug = {{ debug }}
verbose = {{ verbose }} verbose = {{ verbose }}
{% if metering_secret %} {% if metering_secret -%}
metering_secret = {{ metering_secret }} metering_secret = {{ metering_secret }}
{% endif %} {% endif -%}
{% if rabbitmq_host %} {% if rabbitmq_host -%}
rabbit_host = {{ rabbitmq_host }} rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }} rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% endif %} {% endif -%}
{% if auth_host %} {% if auth_host -%}
os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
os_tenant_name = {{ admin_tenant_name }} os_tenant_name = {{ admin_tenant_name }}
os_username = {{ admin_user }} os_username = {{ admin_user }}
os_password = {{ admin_password }} os_password = {{ admin_password }}
{% endif %} {% endif -%}
logdir = /var/log/ceilometer logdir = /var/log/ceilometer

14
templates/havana/ceilometer.conf
View File

@@ -8,22 +8,24 @@
debug = {{ debug }} debug = {{ debug }}
verbose = {{ verbose }} verbose = {{ verbose }}
{% if rabbitmq_host %} {% if rabbitmq_host -%}
rabbit_host = {{ rabbitmq_host }} rabbit_host = {{ rabbitmq_host }}
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }} rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% endif %} {% endif -%}
{% if auth_host %} logdir = /var/log/ceilometer
{% if auth_host -%}
[service_credentials] [service_credentials]
os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0 os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
os_tenant_name = {{ admin_tenant_name }} os_tenant_name = {{ admin_tenant_name }}
os_username = {{ admin_user }} os_username = {{ admin_user }}
os_password = {{ admin_password }} os_password = {{ admin_password }}
{% endif %} {% endif -%}
{% if metering_secret %} {% if metering_secret -%}
[publisher_rpc] [publisher_rpc]
metering_secret = {{ metering_secret }} metering_secret = {{ metering_secret }}
{% endif %} {% endif -%}