diff --git a/neutron/files/mitaka/openvswitch_agent.ini b/neutron/files/mitaka/openvswitch_agent.ini
index d22dda7..4656e35 100644
--- a/neutron/files/mitaka/openvswitch_agent.ini
+++ b/neutron/files/mitaka/openvswitch_agent.ini
@@ -101,6 +101,7 @@
 
 # Network types supported by the agent (gre and/or vxlan). (list value)
 #tunnel_types =
+{%- if "vxlan" in neutron.backend.tenant_network_types %}
 tunnel_types =vxlan
 
 # The UDP port to use for VXLAN tunnels. (port value)
@@ -112,7 +113,6 @@
 # MTU size of veth interfaces (integer value)
 #veth_mtu = 9000
 
-{%- if "vxlan" in neutron.backend.tenant_network_types %}
 # Use ML2 l2population mechanism driver to learn remote MAC and IPs and improve tunnel scalability. (boolean value)
 #l2_population = false
 l2_population = True
@@ -180,7 +180,9 @@
 
 # Local IP address of tunnel endpoint. Can be either an IPv4 or IPv6 address. (IP address value)
 #local_ip = <None>
+{%- if "vxlan" in neutron.backend.tenant_network_types %}
 local_ip = {{ neutron.local_ip }}
+{%- endif %}
 
 # Comma-separated list of <physical_network>:<bridge> tuples mapping physical network names to the agent's node-specific Open vSwitch bridge
 # names to be used for flat and VLAN networks. The length of bridge names should be no more than 11. Each bridge must exist, and should have