Merge "replace string format arguments with function parameters"

15 files changed, 74 insertions, 74 deletions

diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py
index 765a48db..3dacee88 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -34,7 +34,7 @@ def make_client(instance):
         API_NAME,
         instance._api_version[API_NAME],
         API_VERSIONS)
-    LOG.debug('instantiating compute client: %s' % compute_client)
+    LOG.debug('instantiating compute client: %s', compute_client)
 
     # Set client http_log_debug to True if verbosity level is high enough
     http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index ae7ba962..14c4b2c7 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -60,7 +60,7 @@ class CreateAgent(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         args = (
             parsed_args.os,
@@ -88,7 +88,7 @@ class DeleteAgent(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         compute_client.agents.delete(parsed_args.id)
         return
@@ -108,7 +108,7 @@ class ListAgent(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Agent ID",
@@ -152,7 +152,7 @@ class SetAgent(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         args = (
             parsed_args.id,
diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py
index d786d7e5..8fff4e6f 100644
--- a/openstackclient/compute/v2/aggregate.py
+++ b/openstackclient/compute/v2/aggregate.py
@@ -47,7 +47,7 @@ class AddAggregateHost(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -89,7 +89,7 @@ class CreateAggregate(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -124,7 +124,7 @@ class DeleteAggregate(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         data = utils.find_resource(
@@ -150,7 +150,7 @@ class ListAggregate(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -207,7 +207,7 @@ class RemoveAggregateHost(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -257,7 +257,7 @@ class SetAggregate(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         aggregate = utils.find_resource(
@@ -304,7 +304,7 @@ class ShowAggregate(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         data = utils.find_resource(
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index 032168b9..e1f84e23 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -48,7 +48,7 @@ class ShowConsoleLog(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         server = utils.find_resource(
@@ -104,7 +104,7 @@ class ShowConsoleURL(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
             compute_client.servers,
diff --git a/openstackclient/compute/v2/fixedip.py b/openstackclient/compute/v2/fixedip.py
index c41fed45..d105e391 100644
--- a/openstackclient/compute/v2/fixedip.py
+++ b/openstackclient/compute/v2/fixedip.py
@@ -42,7 +42,7 @@ class AddFixedIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
 
         network = utils.find_resource(
@@ -75,7 +75,7 @@ class RemoveFixedIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
 
         server = utils.find_resource(
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index d1d08d8d..73429796 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -93,7 +93,7 @@ class CreateFlavor(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
 
         args = (
@@ -128,7 +128,7 @@ class DeleteFlavor(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         flavor = utils.find_resource(compute_client.flavors,
                                      parsed_args.flavor)
@@ -142,7 +142,7 @@ class ListFlavor(lister.Lister):
     log = logging.getLogger(__name__ + ".ListFlavor")
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "ID",
@@ -177,7 +177,7 @@ class ShowFlavor(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         flavor = utils.find_resource(compute_client.flavors,
                                      parsed_args.flavor)._info.copy()
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index 3edc809e..72b19c6c 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -45,7 +45,7 @@ class AddFloatingIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
 
         server = utils.find_resource(
@@ -70,7 +70,7 @@ class CreateFloatingIP(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         floating_ip = compute_client.floating_ips.create(parsed_args.pool)
 
@@ -94,7 +94,7 @@ class DeleteFloatingIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         floating_ip = utils.find_resource(
@@ -112,7 +112,7 @@ class ListFloatingIP(lister.Lister):
     log = logging.getLogger(__name__ + '.ListFloatingIP')
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         columns = ('ID', 'Pool', 'IP', 'Fixed IP', 'Instance ID')
@@ -146,7 +146,7 @@ class RemoveFloatingIP(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
 
         server = utils.find_resource(
diff --git a/openstackclient/compute/v2/floatingippool.py b/openstackclient/compute/v2/floatingippool.py
index e1da97c3..d5e8d0dd 100644
--- a/openstackclient/compute/v2/floatingippool.py
+++ b/openstackclient/compute/v2/floatingippool.py
@@ -28,7 +28,7 @@ class ListFloatingIPPool(lister.Lister):
     log = logging.getLogger(__name__ + '.ListFloatingIPPool')
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         columns = ('Name',)
diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py
index 44f457d9..4f727388 100644
--- a/openstackclient/compute/v2/host.py
+++ b/openstackclient/compute/v2/host.py
@@ -36,7 +36,7 @@ class ListHost(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Host Name",
@@ -64,7 +64,7 @@ class ShowHost(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Host",
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
index 535062e8..334987e2 100644
--- a/openstackclient/compute/v2/hypervisor.py
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -39,7 +39,7 @@ class ListHypervisor(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "ID",
@@ -71,7 +71,7 @@ class ShowHypervisor(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         hypervisor = utils.find_resource(compute_client.hypervisors,
                                          parsed_args.id)._info.copy()
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 8a91f682..972443a4 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -48,7 +48,7 @@ class CreateKeypair(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         public_key = parsed_args.public_key
@@ -93,7 +93,7 @@ class DeleteKeypair(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         compute_client.keypairs.delete(parsed_args.name)
         return
@@ -105,7 +105,7 @@ class ListKeypair(lister.Lister):
     log = logging.getLogger(__name__ + ".ListKeypair")
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Name",
@@ -140,7 +140,7 @@ class ShowKeypair(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         keypair = utils.find_resource(compute_client.keypairs,
                                       parsed_args.name)
diff --git a/openstackclient/compute/v2/security_group.py b/openstackclient/compute/v2/security_group.py
index be64bd3a..0ba55c98 100644
--- a/openstackclient/compute/v2/security_group.py
+++ b/openstackclient/compute/v2/security_group.py
@@ -71,7 +71,7 @@ class CreateSecurityGroup(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -100,7 +100,7 @@ class DeleteSecurityGroup(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         data = utils.find_resource(
@@ -134,7 +134,7 @@ class ListSecurityGroup(lister.Lister):
             except KeyError:
                 return project_id
 
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
         columns = (
@@ -187,7 +187,7 @@ class SetSecurityGroup(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         data = utils.find_resource(
@@ -228,7 +228,7 @@ class ShowSecurityGroup(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         info = {}
@@ -286,7 +286,7 @@ class CreateSecurityGroupRule(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
         group = utils.find_resource(
@@ -340,7 +340,7 @@ class DeleteSecurityGroupRule(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         group = utils.find_resource(
@@ -374,7 +374,7 @@ class ListSecurityGroupRule(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
         group = utils.find_resource(
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 9cff03d6..f75444f2 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -121,7 +121,7 @@ class AddServerVolume(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
         volume_client = self.app.client_manager.volume
@@ -162,7 +162,7 @@ class AddServerSecurityGroup(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -278,7 +278,7 @@ class CreateServer(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         # Lookup parsed_args.image
@@ -363,8 +363,8 @@ class CreateServer(show.ShowOne):
             scheduler_hints=hints,
             config_drive=config_drive)
 
-        self.log.debug('boot_args: %s' % boot_args)
-        self.log.debug('boot_kwargs: %s' % boot_kwargs)
+        self.log.debug('boot_args: %s', boot_args)
+        self.log.debug('boot_kwargs: %s', boot_kwargs)
         server = compute_client.servers.create(*boot_args, **boot_kwargs)
 
         if parsed_args.wait:
@@ -375,7 +375,7 @@ class CreateServer(show.ShowOne):
             ):
                 sys.stdout.write('\n')
             else:
-                self.log.error('Error creating server: %s' %
+                self.log.error('Error creating server: %s',
                                parsed_args.server_name)
                 sys.stdout.write('\nError creating server')
                 raise SystemExit
@@ -409,7 +409,7 @@ class CreateServerImage(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         image_client = self.app.client_manager.image
         server = utils.find_resource(
@@ -435,7 +435,7 @@ class CreateServerImage(show.ShowOne):
                 sys.stdout.write('\n')
             else:
                 self.log.error(
-                    'Error creating server snapshot: %s' %
+                    'Error creating server snapshot: %s',
                     parsed_args.image_name,
                 )
                 sys.stdout.write('\nError creating server snapshot')
@@ -465,7 +465,7 @@ class DeleteServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
             compute_client.servers, parsed_args.server)
@@ -530,7 +530,7 @@ class ListServer(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         search_opts = {
             'reservation_id': parsed_args.reservation_id,
@@ -600,7 +600,7 @@ class LockServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -672,7 +672,7 @@ class MigrateServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -716,7 +716,7 @@ class PauseServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -762,7 +762,7 @@ class RebootServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
             compute_client.servers, parsed_args.server)
@@ -811,7 +811,7 @@ class RebuildServer(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
 
         # Lookup parsed_args.image
@@ -856,7 +856,7 @@ class RemoveServerSecurityGroup(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
 
@@ -892,7 +892,7 @@ class RemoveServerVolume(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         compute_client = self.app.client_manager.compute
         volume_client = self.app.client_manager.volume
@@ -927,7 +927,7 @@ class RescueServer(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
@@ -968,7 +968,7 @@ class ResizeServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
@@ -1013,7 +1013,7 @@ class ResumeServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -1054,7 +1054,7 @@ class SetServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
@@ -1102,7 +1102,7 @@ class ShowServer(show.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(compute_client.servers,
                                      parsed_args.server)
@@ -1224,7 +1224,7 @@ class SshServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
@@ -1272,7 +1272,7 @@ class SshServer(command.Command):
             cmd += " -v"
 
         cmd += " %s@%s"
-        self.log.debug("ssh command: %s" % (cmd % (login, ip_address)))
+        self.log.debug("ssh command: %s", (cmd % (login, ip_address)))
         os.system(cmd % (login, ip_address))
 
 
@@ -1291,7 +1291,7 @@ class SuspendServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -1315,7 +1315,7 @@ class UnlockServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -1339,7 +1339,7 @@ class UnpauseServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -1363,7 +1363,7 @@ class UnrescueServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
 
         compute_client = self.app.client_manager.compute
         utils.find_resource(
@@ -1395,7 +1395,7 @@ class UnsetServer(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug('take_action(%s)' % parsed_args)
+        self.log.debug('take_action(%s)', parsed_args)
         compute_client = self.app.client_manager.compute
         server = utils.find_resource(
             compute_client.servers,
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 5e57e0aa..4b2ebac6 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -40,7 +40,7 @@ class ListService(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Binary",
@@ -88,7 +88,7 @@ class SetService(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
         compute_client = self.app.client_manager.compute
         columns = (
             "Host",
diff --git a/openstackclient/compute/v2/usage.py b/openstackclient/compute/v2/usage.py
index 1dfe8c0a..f7e11bca 100644
--- a/openstackclient/compute/v2/usage.py
+++ b/openstackclient/compute/v2/usage.py
@@ -47,7 +47,7 @@ class ListUsage(lister.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        self.log.debug("take_action(%s)" % parsed_args)
+        self.log.debug("take_action(%s)", parsed_args)
 
         def _format_project(project):
             if not project: