diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 12a44b4..0e59942 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -31,4 +31,9 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        ha_queues: true
\ No newline at end of file
+        ha_queues: true
+      compute:
+        host: ${_param:cluster_vip_address}
+        user: nova
+        password: ${_param:keystone_nova_password}
+        tenant: service
\ No newline at end of file
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index bb3c6de..7fc2d57 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -32,3 +32,8 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
+      compute:
+        host: ${_param:single_address}
+        user: nova
+        password: ${_param:keystone_nova_password}
+        tenant: service
\ No newline at end of file
diff --git a/neutron/files/kilo/neutron-server.conf.contrail.Debian b/neutron/files/kilo/neutron-server.conf.contrail.Debian
index 5ab2f99..d822922 100644
--- a/neutron/files/kilo/neutron-server.conf.contrail.Debian
+++ b/neutron/files/kilo/neutron-server.conf.contrail.Debian
@@ -339,19 +339,24 @@
 # ======== neutron nova interactions ==========
 # Send notification to nova when port status is active.
 # notify_nova_on_port_status_changes = True
+notify_nova_on_port_status_changes = True
 
 # Send notifications to nova when port data (fixed_ips/floatingips) change
 # so nova can update it's cache.
 # notify_nova_on_port_data_changes = True
+notify_nova_on_port_data_changes = True
 
 # URL for connection to nova (Only supports one nova region currently).
 # nova_url = http://127.0.0.1:8774/v2
+nova_url = http://{{ neutron.compute.host }}:8774/v2
 
 # Name of nova region to use. Useful if keystone manages more than one region
 # nova_region_name =
+nova_region_name = RegionOne
 
 # Username for connection to nova in admin context
 # nova_admin_username =
+nova_admin_username = {{ neutron.compute.user }}
 
 # The uuid of the admin nova tenant
 # nova_admin_tenant_id =
@@ -360,12 +365,15 @@
 # is set, this is optional.  Useful for cases where the uuid of the admin
 # nova tenant is not available when configuration is being done.
 # nova_admin_tenant_name =
+nova_admin_tenant_name = {{ neutron.compute.tenant }}
 
 # Password for connection to nova in admin context.
 # nova_admin_password =
+nova_admin_password = {{ neutron.compute.password }}
 
 # Authorization URL for connection to nova in admin context.
 # nova_admin_auth_url =
+nova_admin_auth_url = http://{{ neutron.identity.host }}:35357
 
 # CA file for novaclient to verify server certificates
 # nova_ca_certificates_file =
@@ -375,6 +383,7 @@
 
 # Number of seconds between sending events to nova if there are any events to send
 # send_events_interval = 2
+send_events_interval = 2
 
 # ======== end of neutron nova interactions ==========