diff --git a/templates/grizzly/ceilometer.conf b/templates/grizzly/ceilometer.conf
index 5a411a2..fe4e70d 100644
--- a/templates/grizzly/ceilometer.conf
+++ b/templates/grizzly/ceilometer.conf
@@ -8,22 +8,22 @@
 debug = {{ debug }}
 verbose = {{ verbose }}
 
-{% if metering_secret %}
+{% if metering_secret -%}
 metering_secret = {{ metering_secret }}
-{% endif %}
+{% endif -%}
 
-{% if rabbitmq_host %}
+{% if rabbitmq_host -%}
 rabbit_host = {{ rabbitmq_host }}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_password = {{ rabbitmq_password }}
 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_tenant_name = {{ admin_tenant_name }}
 os_username = {{ admin_user }}
 os_password = {{ admin_password }}
-{% endif %}
+{% endif -%}
 
 logdir = /var/log/ceilometer
diff --git a/templates/havana/ceilometer.conf b/templates/havana/ceilometer.conf
index 715ac21..2bd5d34 100644
--- a/templates/havana/ceilometer.conf
+++ b/templates/havana/ceilometer.conf
@@ -8,22 +8,24 @@
 debug = {{ debug }}
 verbose = {{ verbose }}
 
-{% if rabbitmq_host %}
+{% if rabbitmq_host -%}
 rabbit_host = {{ rabbitmq_host }}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_password = {{ rabbitmq_password }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-{% endif %}
+{% endif -%}
 
-{% if auth_host %}
+logdir = /var/log/ceilometer
+
+{% if auth_host -%}
 [service_credentials]
 os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
 os_tenant_name = {{ admin_tenant_name }}
 os_username = {{ admin_user }}
 os_password = {{ admin_password }}
-{% endif %}
+{% endif -%}
 
-{% if metering_secret %}
+{% if metering_secret -%}
 [publisher_rpc]
 metering_secret = {{ metering_secret }}
-{% endif %}
+{% endif -%}