diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-20 13:37:21 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-04-20 13:37:21 -0700 |
| commit | 2e9b8301e835a97bf250026f98c7729d76be4407 (patch) | |
| tree | 7586242831e733fbfb30ff1724ddc32631ab87af | |
| parent | db26ae5d02315f171704c209725ba511d76e3614 (diff) | |
fix display of vpn instance id and add output rule so it can be tested from network host
| -rwxr-xr-x | bin/nova-manage | 2 | ||||
| -rw-r--r-- | nova/network/linux_net.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index b2308bc03..55e275e7a 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -151,7 +151,7 @@ class VpnCommands(object): state = 'up' print address, print vpn['host'], - print vpn['ec2_id'], + print ec2utils.id_to_ec2_id(vpn['id']), print vpn['state_description'], print state else: diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index ec5579dee..ad9b3f13c 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -407,6 +407,10 @@ def ensure_vlan_forward(public_ip, port, private_ip): "-d %s -p udp " "--dport %s -j DNAT --to %s:1194" % (public_ip, port, private_ip)) + iptables_manager.ipv4['nat'].add_rule("OUTPUT", + "-d %s -p udp " + "--dport %s -j DNAT --to %s:1194" % + (public_ip, port, private_ip)) iptables_manager.apply() |
