openstack/charm-ceilometer
Code Issues Proposed changes

Tidy templates, add parts

Browse Source
This commit is contained in:
James Page
2014-04-01 09:01:47 +01:00
parent c13404061e
commit 86830460c6
3 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/grizzly/ceilometer.conf
View File

@@ -8,33 +8,15 @@
debug = {{ debug }} debug = {{ debug }}
verbose = {{ verbose }} verbose = {{ verbose }}
use_syslog = {{ use_syslog }} use_syslog = {{ use_syslog }}
metering_secret = {{ metering_secret }} metering_secret = {{ metering_secret }}
metering_api_port = {{ port }} metering_api_port = {{ port }}
{% include "parts/rabbitmq" %}
{% if rabbitmq_host or rabbitmq_hosts -%}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues=true
rabbit_durable_queues=false
{% endif %}
{% else %}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% endif -%}
database_connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }} database_connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
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 }}
logdir = /var/log/ceilometer logdir = /var/log/ceilometer
[keystone_authtoken] [keystone_authtoken]
auth_host = {{ auth_host }} auth_host = {{ auth_host }}
auth_port = {{ auth_port }} auth_port = {{ auth_port }}

28
templates/havana/ceilometer.conf
View File

@@ -8,44 +8,18 @@
debug = {{ debug }} debug = {{ debug }}
verbose = {{ verbose }} verbose = {{ verbose }}
use_syslog = {{ use_syslog }} use_syslog = {{ use_syslog }}
{% include "parts/rabbitmq" %}
{% if rabbitmq_host or rabbitmq_hosts -%}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues=true
rabbit_durable_queues=false
{% endif %}
{% else %}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
{% if rabbit_ssl_port %}
rabbit_use_ssl=True
rabbit_port={{ rabbit_ssl_port }}
{% if rabbit_ssl_ca %}
kombu_ssl_ca_certs={{rabbit_ssl_ca}}
{% endif %}
{% endif %}
{% endif %}
[api] [api]
port = {{ port }} port = {{ port }}
[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 }}
[database] [database]
connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }} connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
[publisher_rpc] [publisher_rpc]
metering_secret = {{ metering_secret }} metering_secret = {{ metering_secret }}
[keystone_authtoken] [keystone_authtoken]
auth_host = {{ auth_host }} auth_host = {{ auth_host }}
auth_port = {{ auth_port }} auth_port = {{ auth_port }}

21
templates/parts/rabbitmq Normal file
View File

@@ -0,0 +1,21 @@
{% if rabbitmq_host or rabbitmq_hosts -%}
rabbit_userid = {{ rabbitmq_user }}
rabbit_virtual_host = {{ rabbitmq_virtual_host }}
rabbit_password = {{ rabbitmq_password }}
{% if rabbitmq_hosts -%}
rabbit_hosts = {{ rabbitmq_hosts }}
{% if rabbitmq_ha_queues -%}
rabbit_ha_queues = True
rabbit_durable_queues = False
{% endif -%}
{% else -%}
rabbit_host = {{ rabbitmq_host }}
{% endif -%}
{% if rabbit_ssl_port -%}
rabbit_use_ssl = True
rabbit_port = {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
{% endif -%}
{% endif -%}
{% endif -%}