summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-02-22 20:45:36 +0100
committerSoren Hansen <soren@linux2go.dk>2011-02-22 20:45:36 +0100
commit8b0e8b155eab313e0caece48eee609d12df5e5d4 (patch)
tree5fd5481f6a01542887fda9ca3e57efaa7aa5c9e3
parent7eee81ee6480a36b179ae26be88ebad9415c4b62 (diff)
downloadnova-8b0e8b155eab313e0caece48eee609d12df5e5d4.tar.gz
nova-8b0e8b155eab313e0caece48eee609d12df5e5d4.tar.xz
nova-8b0e8b155eab313e0caece48eee609d12df5e5d4.zip
Rename "SNATTING" chain to "snat".
-rw-r--r--nova/network/linux_net.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 849181641..34337901a 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -208,7 +208,7 @@ class IptablesManager(object):
For ipv4, the builtin PREROUTING, OUTPUT, and POSTROUTING nat chains are
wrapped in the same was as the builtin filter chains. Additionally, there's
- a SNATTING chain that is applied after the POSTROUTING chain.
+ a snat chain that is applied after the POSTROUTING chain.
"""
def __init__(self, execute=None):
if not execute:
@@ -261,16 +261,16 @@ class IptablesManager(object):
self.ipv4['nat'].add_rule('POSTROUTING', '-j nova-postrouting-bottom',
wrap=False)
- # We add a SNATTING chain to the shared nova-postrouting-bottom chain
+ # We add a snat chain to the shared nova-postrouting-bottom chain
# so that it's applied last.
- self.ipv4['nat'].add_chain('SNATTING')
- self.ipv4['nat'].add_rule('nova-postrouting-bottom', '-j $SNATTING',
+ self.ipv4['nat'].add_chain('snat')
+ self.ipv4['nat'].add_rule('nova-postrouting-bottom', '-j $snat',
wrap=False)
# And then we add a floating-snat chain and jump to first thing in
- # the SNATTING chain.
+ # the snat chain.
self.ipv4['nat'].add_chain('floating-snat')
- self.ipv4['nat'].add_rule('SNATTING', '-j $floating-snat')
+ self.ipv4['nat'].add_rule('snat', '-j $floating-snat')
self.semaphore = semaphore.Semaphore()
@@ -376,7 +376,7 @@ def init_host():
# NOTE(devcamcar): Cloud public SNAT entries and the default
# SNAT rule for outbound traffic.
- iptables_manager.ipv4['nat'].add_rule("SNATTING",
+ iptables_manager.ipv4['nat'].add_rule("snat",
"-s %s -j SNAT --to-source %s" % \
(FLAGS.fixed_range,
FLAGS.routing_source_ip))