x/packstack
Code Issues Proposed changes

Merge "Handle interface names containing ".", "-" or ":""

Browse Source
This commit is contained in:
Jenkins
2014-06-16 07:15:51 +00:00
committed by Gerrit Code Review
parent 75a3348a0d 5b20d5ed1e
commit 4bc938c3df
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packstack/puppet/templates/neutron_ovs_agent_gre.pp
View File

@@ -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'
}

3
packstack/puppet/templates/neutron_ovs_agent_vxlan.pp
View File

@@ -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'
}