summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren.hansen@rackspace.com>2010-09-28 09:47:25 +0200
committerSoren Hansen <soren.hansen@rackspace.com>2010-09-28 09:47:25 +0200
commit0dcf2e7e593cce4be1654fb4923ec4bb4524198f (patch)
tree2136831ac68c85ba821a92820dcc07253cb227e2
parent886534ba4d0281afc0d169546a8d55d3a5c8ece9 (diff)
downloadnova-0dcf2e7e593cce4be1654fb4923ec4bb4524198f.tar.gz
nova-0dcf2e7e593cce4be1654fb4923ec4bb4524198f.tar.xz
nova-0dcf2e7e593cce4be1654fb4923ec4bb4524198f.zip
Make sure arguments to string format are in the correct order.
-rw-r--r--nova/virt/libvirt_conn.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 40a921743..c86f3ffb7 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -531,7 +531,8 @@ class NWFilterFirewall(object):
('in','drop', 399)]:
retval += """<rule action='%s' direction='%s' priority='%d'>
<%s />
- </rule>""" % (action, direction, protocol, priority)
+ </rule>""" % (action, direction,
+ priority, protocol)
retval += '</filter>'
return retval
@@ -544,7 +545,7 @@ class NWFilterFirewall(object):
retval += """<rule action='%s' direction='%s' priority='%d'>
<%s-ipv6 />
</rule>""" % (action, direction,
- protocol, priority)
+ priority, protocol)
retval += '</filter>'
return retval