From 0dcf2e7e593cce4be1654fb4923ec4bb4524198f Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Tue, 28 Sep 2010 09:47:25 +0200
Subject: Make sure arguments to string format are in the correct order.

---
 nova/virt/libvirt_conn.py | 5 +++--
 1 file 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
 
-- 
cgit