Commit 0fd94f65 authored by Xavier Thompson's avatar Xavier Thompson

slapformat: Fix ipv6_prefixshift typo

parent b0561e00
...@@ -1312,14 +1312,14 @@ class Interface(object): ...@@ -1312,14 +1312,14 @@ class Interface(object):
self._reserveIpv6Range(result_addr['addr'], result_addr['prefixlen']) self._reserveIpv6Range(result_addr['addr'], result_addr['prefixlen'])
return result_addr return result_addr
if self._ipv6_prefixshift != 16: if self.ipv6_prefixshift != 16:
self._logger.error( self._logger.error(
"Address %s/%s for partition %s is already taken;" "Address %s/%s for partition %s is already taken;"
" aborting because IPv6 prefixshift is %s != 16" % ( " aborting because IPv6 prefixshift is %s != 16" % (
result_addr['addr'], result_addr['addr'],
result_addr['prefixlen'], result_addr['prefixlen'],
'%s tap' % partition_index if tap else partition_index, '%s tap' % partition_index if tap else partition_index,
self._ipv6_prefixshift, self.ipv6_prefixshift,
)) ))
raise AddressGenerationError(addr) raise AddressGenerationError(addr)
...@@ -1375,13 +1375,13 @@ class Interface(object): ...@@ -1375,13 +1375,13 @@ class Interface(object):
if self._tryReserveIpv6Range(ipv6_range['addr'], ipv6_range['prefixlen']): if self._tryReserveIpv6Range(ipv6_range['addr'], ipv6_range['prefixlen']):
return ipv6_range return ipv6_range
if self._ipv6_prefixshift != 16: if self.ipv6_prefixshift != 16:
self._logger.error( self._logger.error(
"Address % for partition %s is already taken;" "Address % for partition %s is already taken;"
" aborting because IPv6 prefixshift is %s != 16" % ( " aborting because IPv6 prefixshift is %s != 16" % (
ipv6_range['network'], ipv6_range['network'],
'%s tun' % i if tun else i, '%s tun' % i if tun else i,
self._ipv6_prefixshift, self.ipv6_prefixshift,
)) ))
raise AddressGenerationError(ipv6_range['addr']) raise AddressGenerationError(ipv6_range['addr'])
......
  • we need a release with this change don't we ? I'm installing a machine with https://deploy.erp5.net/slapos it uses slapos-node 1.9.2 and this fails with

    `AttributeError: 'Interface' object has no attribute '_ipv6_prefixshift'`

    /cc @tomo

Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment