diff --git a/.pydevproject b/.pydevproject
index 03a4f191..a69fbde8 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -3,7 +3,7 @@
python 2.7
Default
-/nova-compute-charm/hooks
-/nova-compute-charm/unit_tests
+/nova-compute/hooks
+/nova-compute/unit_tests
diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index 7677bcb5..990d1066 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -11,7 +11,6 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
dhcpbridge=/usr/bin/nova-dhcpbridge
logdir=/var/log/nova
state_path=/var/lib/nova
-lock_path=/var/lock/nova
force_dhcp_release=True
verbose=True
use_syslog = {{ use_syslog }}
@@ -24,8 +23,6 @@ my_ip = {{ host_ip }}
{% include "parts/database" %}
-{% include "parts/rabbitmq" %}
-
{% if console_vnc_type -%}
vnc_enabled = True
novnc_enabled = True
@@ -138,3 +135,8 @@ live_migration_uri = {{ live_migration_uri }}
{% if disk_cachemodes -%}
disk_cachemodes = {{ disk_cachemodes }}
{% endif -%}
+
+{% 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