diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index 47489f8b..14a6e68c 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -6,16 +6,12 @@
 [DEFAULT]
 logdir=/var/log/nova
 state_path=/var/lib/nova
-lock_path=/var/lock/nova
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
 verbose= {{ verbose }}
 use_syslog = {{ use_syslog }}
 api_paste_config=/etc/nova/api-paste.ini
 enabled_apis=metadata
 multi_host=True
-{% include "parts/database" %}
-# Access to message bus
-{% include "parts/rabbitmq" %}
 # Access to neutron API services
 network_api_class=nova.network.neutronv2.api.API
 [neutron]
@@ -27,3 +23,8 @@ admin_password={{ service_password }}
 admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
 service_metadata_proxy=True
 metadata_proxy_shared_secret={{ shared_secret }}
+
+{% include "parts/section-rabbitmq" %}
+
+[oslo_concurrency]
+lock_path=/var/lock/nova
diff --git a/templates/parts/section-rabbitmq b/templates/parts/section-rabbitmq
new file mode 100644
index 00000000..df21178b
--- /dev/null
+++ b/templates/parts/section-rabbitmq
@@ -0,0 +1,22 @@
+{% if rabbitmq_host or rabbitmq_hosts -%}
+[oslo_messaging_rabbit]
+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 -%}
\ No newline at end of file