diff options
| author | Josh Kearney <josh@jk0.org> | 2011-05-05 10:23:48 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-05-05 10:23:48 -0500 |
| commit | 310a43e6cccb151a5bcbeca8c30c25f229e6578c (patch) | |
| tree | 7fd582cec85865d53ec310ae583501ebc6d61cfb | |
| parent | 63bfb59d7c2978edbeac0816bb234d28253facd6 (diff) | |
| parent | 114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff) | |
Merged trunk
| -rwxr-xr-x | bin/nova-manage | 2 | ||||
| -rw-r--r-- | nova/network/linux_net.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_misc.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage index 3dff16f27..2f6af6e2d 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 ef997fd41..b50a4b4ea 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -406,6 +406,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() diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py index ad62b48bf..cf8f4c05e 100644 --- a/nova/tests/test_misc.py +++ b/nova/tests/test_misc.py @@ -68,7 +68,7 @@ class ProjectTestCase(test.TestCase): contributors.add(str_dict_replace(email, mailmap)) else: - self.assertTrue(False, 'Cannot read commit history') + return for contributor in contributors: if contributor == 'nova-core': |