diff --git a/opencontrail/files/3.0/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
index 219561a..bea2565 100644
--- a/opencontrail/files/3.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -207,7 +207,11 @@
 # this only if vhost interface is un-numbered in host-os. Agent will use one
 # of the compute_node_address to run services that need IP Address in host-os
 # (like metadata...)
-#compute_node_address = 10.204.216.28
+{%- if compute.bind is defined %}
+compute_node_address={{ compute.bind.address }}
+{%- else %}
+compute_node_address={{ compute.interface.address }}
+{%- endif %}
 
 # We can have multiple gateway sections with different indices in the
 # following format