x
/
packstack
Code Issues Proposed changes

add IPv6 support for choose_my_ip function 

Several place need to use choose_my_ip function to know which IP offered
to packstack belongs to current node. Unfortunately, IPv6 version failed.
With this change, it will be OK no matter which IP version given.
For both ovs_agent and ovn_agent, add split ":" matching besides dot to
support IPv6.

Closes-Bug: #1838732

Change-Id: I0269db6641bca335685140d2d6439bc795cd8c46
Signed-off-by: Guo Larry <larry.guo@nokia-sbell.com>
(cherry picked from commit 02bd30d943)
This commit is contained in:
Guo Larry 2019-08-02 16:18:04 +08:00 committed by Alfredo Moralejo
parent 8557a38e00
commit d3eea20b1a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/puppet/modules/packstack/lib/puppet/parser/functions/choose_my_ip.rb
View File

@ -14,9 +14,11 @@ module Puppet::Parser::Functions
if not host_list.kind_of?(Array)
host_list = [host_list]
end
my_ips = lookupvar('interfaces').split(',').map do |interface|
my_ips = Array.new
lookupvar('interfaces').split(',').each do |interface|
interface.strip!
lookupvar("ipaddress_#{interface}")
my_ips.push(lookupvar("ipaddress_#{interface}"))
my_ips.push(lookupvar("ipaddress6_#{interface}"))
end
result = nil

2
packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
View File

@ -1,7 +1,7 @@
class packstack::neutron::ovn_agent ()
{
$my_ip = choose_my_ip(hiera('HOST_LIST'))
$my_ip_without_dot = regsubst($my_ip, '\.', '_', 'G')
$my_ip_without_dot = regsubst($my_ip, '[\.\:]', '_', 'G')
$neutron_tunnel_rule_name = "FIREWALL_NEUTRON_TUNNEL_RULES_${my_ip_without_dot}"
create_resources(packstack::firewall, hiera($neutron_tunnel_rule_name, {}))

2
packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
View File

@ -1,7 +1,7 @@
class packstack::neutron::ovs_agent ()
{
$my_ip = choose_my_ip(hiera('HOST_LIST'))
$my_ip_without_dot = regsubst($my_ip, '\.', '_', 'G')
$my_ip_without_dot = regsubst($my_ip, '[\.\:]', '_', 'G')
$neutron_tunnel_rule_name = "FIREWALL_NEUTRON_TUNNEL_RULES_${my_ip_without_dot}"
create_resources(packstack::firewall, hiera($neutron_tunnel_rule_name, {}))