diff options
author | Feng Pan <fpan@redhat.com> | 2018-08-16 11:36:58 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2018-08-17 11:25:16 -0400 |
commit | 5ce42bedb325439ae1e907cc0076a2e6d1266787 (patch) | |
tree | de69cf99b43a315f1ebf3a2e94953924005efdfa /apex/undercloud | |
parent | c0a4aa96bbe70eefb179d59a1267b8115651bba5 (diff) |
Fix ipv6 deployment failures
- fix ipv6 enable command on bridge interfaces
- fix external subnet creation command
- enable NAT when admin is ipv4
- fix network settings file for ipv6 for br-ex interface type
Change-Id: Ibd2dbe1d0c8e8df72ad1b0b3713a19f8bbc56eef
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'apex/undercloud')
-rw-r--r-- | apex/undercloud/undercloud.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apex/undercloud/undercloud.py b/apex/undercloud/undercloud.py index d2de2de1..56087695 100644 --- a/apex/undercloud/undercloud.py +++ b/apex/undercloud/undercloud.py @@ -263,8 +263,11 @@ class Undercloud: "prefix": str(ns_external['cidr']).split('/')[1], "enabled": ns_external['enabled'] } - # TODO(trozet): clean this logic up and merge with above - if 'external' in ns.enabled_network_list: + # We will NAT external network if it is enabled. If external network + # is IPv6, we will NAT admin network in case we need IPv4 connectivity + # for things like DNS server. + if 'external' in ns.enabled_network_list and \ + ns_external['cidr'].version == 4: nat_cidr = ns_external['cidr'] else: nat_cidr = ns['networks']['admin']['cidr'] |