summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-04-05 20:07:46 -0400
committerTodd Willey <todd@ansolabs.com>2011-04-05 20:07:46 -0400
commit26d2a6ca8939156e8957e31dd17906070283ff24 (patch)
tree002965aa96621209e14253ac56fcfdb7ac1596cd
parent2b7da3f2e9fa45f9bfca03bb6bcb713dcb6c58fe (diff)
Undo use of $ in chain name where not needed.
-rw-r--r--nova/virt/libvirt_conn.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 9bc7ca05a..0d92e2e70 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -2143,20 +2143,20 @@ class IptablesFirewallDriver(FirewallDriver):
self.build_provider_fw_rules(self)
def _purge_provider_fw_rules(self):
- """Remove all rules from the $provider chains."""
- self.iptables.ipv4['filter'].empty_chain('$provider')
+ """Remove all rules from the provider chains."""
+ self.iptables.ipv4['filter'].empty_chain('provider')
if FLAGS.use_ipv6:
- self.iptables.ipv6['filter'].empty_chain('$provider')
+ self.iptables.ipv6['filter'].empty_chain('provider')
def _build_provider_fw_rules(self):
"""Create all rules for the provider IP DROPs."""
ipv4_rules, ipv6_rules = self._provider_rules()
for rule in ipv4_rules:
- self.iptables.ipv4['filter'].add_rule('$provider', rule)
+ self.iptables.ipv4['filter'].add_rule('provider', rule)
if FLAGS.use_ipv6:
for rule in ipv6_rules:
- self.iptables.ipv6['filter'].add_rule('$provider', rule)
+ self.iptables.ipv6['filter'].add_rule('provider', rule)
def _provider_rules(self):
"""Generate a list of rules from provider for IP4 & IP6."""
@@ -2182,7 +2182,7 @@ class IptablesFirewallDriver(FirewallDriver):
if version == 6 and rule.protocol == 'icmp':
protocol = 'icmpv6'
- args = ['-A', '$provider', '-p', protocol, '-s', rule.cidr]
+ args = ['-p', protocol, '-s', rule.cidr]
if rule.protocol in ['udp', 'tcp']:
if rule.from_port == rule.to_port: