github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Extend container_bridge.py (salt lib) to support IPv6

Browse Source
This commit is contained in:
Justin SB 2014-11-04 06:33:34 -08:00
parent 9a053a4b59
commit 8e70a664e8
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cluster/saltbase/salt/_states/container_bridge.py
View File

@ -34,11 +34,22 @@ def ensure(name, cidr, mtu=1460):
''' '''
ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''} ret = {'name': name, 'changes': {}, 'result': False, 'comment': ''}
# This is a little hacky. I should probably import a real library for this
# but this'll work for now.
try:
cidr_network = ipaddr.IPNetwork(cidr, strict=True)
except Exception:
raise salt.exceptions.SaltInvocationError(
'Invalid CIDR \'{0}\''.format(cidr))
if cidr_network.version == 4:
iptables_rule = { iptables_rule = {
'table': 'nat', 'table': 'nat',
'chain': 'POSTROUTING', 'chain': 'POSTROUTING',
'rule': '-o eth0 -j MASQUERADE \! -d 10.0.0.0/8' 'rule': '-o eth0 -j MASQUERADE \! -d 10.0.0.0/8'
} }
else:
iptables_rule = None
def bridge_exists(name): def bridge_exists(name):
'Determine if a bridge exists already.' 'Determine if a bridge exists already.'
@ -90,20 +101,15 @@ def ensure(name, cidr, mtu=1460):
ret['details'] = {} ret['details'] = {}
# This module function is strange and returns True if the rule exists. # This module function is strange and returns True if the rule exists.
# If not, it returns a string with the error from the call to iptables. # If not, it returns a string with the error from the call to iptables.
if iptables_rule:
ret['iptables_rule_exists'] = \ ret['iptables_rule_exists'] = \
__salt__['iptables.check'](**iptables_rule) == True __salt__['iptables.check'](**iptables_rule) == True
else:
ret['iptables_rule_exists'] = True
return ret return ret
# This is a little hacky. I should probably import a real library for this
# but this'll work for now.
try:
cidr_network = ipaddr.IPv4Network(cidr, strict=True)
except Exception:
raise salt.exceptions.SaltInvocationError(
'Invalid CIDR \'{0}\''.format(cidr))
desired_network = '{0}/{1}'.format( desired_network = '{0}/{1}'.format(
str(ipaddr.IPv4Address(cidr_network._ip + 1)), str(ipaddr.IPAddress(cidr_network._ip + 1)),
str(cidr_network.prefixlen)) str(cidr_network.prefixlen))
current_state = get_current_state() current_state = get_current_state()
@ -147,7 +153,7 @@ def ensure(name, cidr, mtu=1460):
__salt__['cmd.run']( __salt__['cmd.run'](
'ip link set dev {0} up'.format(name)) 'ip link set dev {0} up'.format(name))
new_state = get_current_state() new_state = get_current_state()
if not new_state['iptables_rule_exists']: if iptables_rule and not new_state['iptables_rule_exists']:
__salt__['iptables.append'](**iptables_rule) __salt__['iptables.append'](**iptables_rule)
new_state = get_current_state() new_state = get_current_state()