diff --git a/opencontrail/files/3.0/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
index 6522e53..e0104b5 100644
--- a/opencontrail/files/3.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -8,6 +8,9 @@
 # (separated by a space) can be provided. If no IP is configured then the
 # value provided by discovery service will be used. (Optional)
 # server=10.0.0.1 10.0.0.2
+{%- if not compute.discovery.get('enabled', True) %}
+server={% for member in compute.control.members %}{{ member.host }}{% if not loop.last %} {% endif %}{% endfor %}
+{%- endif %}
 
 [DEFAULT]
 # Everything in this section is optional
@@ -16,6 +19,9 @@
 # configured, value provided by discovery service will be used. Multiple
 # IP:port strings separated by space can be provided
 # collectors=127.0.0.1:8086
+{%- if not compute.discovery.get('enabled', True) %}
+server={% for member in compute.collector.members %}{{ member.host }}:8086{% if not loop.last %} {% endif %}{% endfor %}
+{%- endif %}
 
 # Agent mode : can be vrouter / tsn / tor (default is vrouter)
 # agent_mode=
@@ -92,7 +98,9 @@
 # IP address and port of discovery server
 # port=5998
 # server=127.0.0.1
+{%- if compute.discovery.get('enabled', True) %}
 server={{ compute.discovery.host }}
+{%- endif %}
 
 # Number of control-nodes info to be provided by Discovery service. Possible
 # values are 1 and 2
@@ -103,6 +111,9 @@
 # addresses (separated by a space) can be provided. If no IP is configured then
 # the value provided by discovery service will be used.
 # server=10.0.0.1:53 10.0.0.2:53
+{%- if not compute.discovery.get('enabled', True) %}
+server={% for member in compute.control.members %}{{ member.host }}:53{% if not loop.last %} {% endif %}{% endfor %}
+{%- endif %}
 
 # Client port used by vrouter-agent while connecting to contrail-named
 # dns_client_port=