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/liberty/neutron-server.conf.contrail.Debian b/neutron/files/liberty/neutron-server.conf.contrail.Debian
index 23bcedf..d822922 100644
--- a/neutron/files/liberty/neutron-server.conf.contrail.Debian
+++ b/neutron/files/liberty/neutron-server.conf.contrail.Debian
@@ -348,7 +348,7 @@
 
 # URL for connection to nova (Only supports one nova region currently).
 # nova_url = http://127.0.0.1:8774/v2
-nova_url = http://{{ neutron.identity.host }}: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 =