diff --git a/packstack/puppet/templates/neutron_ovs_agent_gre.pp b/packstack/puppet/templates/neutron_ovs_agent_gre.pp
index 0f635b031..40c9f0025 100644
--- a/packstack/puppet/templates/neutron_ovs_agent_gre.pp
+++ b/packstack/puppet/templates/neutron_ovs_agent_gre.pp
@@ -1,5 +1,6 @@
 if "%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s" {
-  $localip = $ipaddress_%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s
+  $iface = regsubst('%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s', '[\.\-\:]', '_', 'G')
+  $localip = inline_template("<%%= scope.lookupvar('::ipaddress_${iface}') %%>")
 } else {
   $localip = '%(CONFIG_NEUTRON_OVS_HOST)s'
 }
diff --git a/packstack/puppet/templates/neutron_ovs_agent_vxlan.pp b/packstack/puppet/templates/neutron_ovs_agent_vxlan.pp
index 078a0eea8..93bca4134 100644
--- a/packstack/puppet/templates/neutron_ovs_agent_vxlan.pp
+++ b/packstack/puppet/templates/neutron_ovs_agent_vxlan.pp
@@ -1,6 +1,7 @@
 
 if "%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s" {
-  $localip = $ipaddress_%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s
+  $iface = regsubst('%(CONFIG_NEUTRON_OVS_TUNNEL_IF)s', '[\.\-\:]', '_', 'G')
+  $localip = inline_template("<%%= scope.lookupvar('::ipaddress_${iface}') %%>")
 } else {
   $localip = '%(CONFIG_NEUTRON_OVS_HOST)s'
 }