diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-03-14 08:31:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-14 08:31:26 +0000 |
| commit | c5e40bf74b6726061a7bf6add287c5f65353e4a1 (patch) | |
| tree | e567b199d848647381caff9ddaeb9c59717097d2 /sdnvpn/lib/quagga.py | |
| parent | b36bffc1ab5174635ac27f57fe66cc780e9010aa (diff) | |
| parent | 8b7a77c93d4534566a431871deafb22335306808 (diff) | |
Merge "Fix quagga peering by working around the NAT" into stable/danube
Diffstat (limited to 'sdnvpn/lib/quagga.py')
| -rw-r--r-- | sdnvpn/lib/quagga.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sdnvpn/lib/quagga.py b/sdnvpn/lib/quagga.py index e2885c2..9f8a4cd 100644 --- a/sdnvpn/lib/quagga.py +++ b/sdnvpn/lib/quagga.py @@ -29,10 +29,14 @@ def bootstrap_quagga(fip_addr, controller_ip): return rc == 0 -def gen_quagga_setup_script(controller_ip, instance_floating_ip): +def gen_quagga_setup_script(controller_ip, + fake_floating_ip, + ext_net_mask): with open(COMMON_CONFIG.quagga_setup_script_path) as f: template = f.read() - script = template % (controller_ip, instance_floating_ip) + script = template % (controller_ip, + fake_floating_ip, + ext_net_mask) return script |