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/network | |
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/network')
-rw-r--r-- | apex/network/jumphost.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apex/network/jumphost.py b/apex/network/jumphost.py index c28c105e..86556659 100644 --- a/apex/network/jumphost.py +++ b/apex/network/jumphost.py @@ -53,12 +53,8 @@ def configure_bridges(ns): if cidr.version == 6: ipv6_br_path = "/proc/sys/net/ipv6/conf/{}/disable_" \ "ipv6".format(NET_MAP[network]) - try: - subprocess.check_call('echo', 0, '>', ipv6_br_path) - except subprocess.CalledProcessError: - logging.error("Unable to enable ipv6 on " - "bridge {}".format(NET_MAP[network])) - raise + with open(ipv6_br_path, 'w') as f: + print(0, file=f) try: ip_prefix = "{}/{}".format(ovs_ip, cidr.prefixlen) subprocess.check_call(['ip', 'addr', 'add', ip_prefix, 'dev', |