diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-01-25 20:50:14 +0000 |
| commit | fc8f41e9c34c8d14d1c66ca03ce7098cc6b7f04d (patch) | |
| tree | 9e4c224d36a054136d3a7ec18d0f66da52e05551 /bin | |
| parent | 2e6a5713d86b487c0b26a72b111531781745aeb2 (diff) | |
| parent | b2d0a77c53d1bd108d233e58f68655381cec4e16 (diff) | |
Merge from trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 2 | ||||
| -rwxr-xr-x | bin/nova-dhcpbridge | 6 | ||||
| -rw-r--r-- | bin/nova-spoolsentry | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/bin/nova-api b/bin/nova-api index 44bbfaf86..11176a021 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -56,7 +56,7 @@ def run_app(paste_config_file): if config is None: LOG.debug(_("No paste configuration for app: %s"), api) continue - LOG.debug(_("App Config: %s\n%r"), api, config) + LOG.debug(_("App Config: %(api)s\n%(config)r") % locals()) wsgi.paste_config_to_flags(config, { "verbose": FLAGS.verbose, "%s_host" % api: config.get('host', '0.0.0.0'), diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 1a994d956..d38ba2543 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -120,9 +120,9 @@ def main(): mac = argv[2] ip = argv[3] hostname = argv[4] - LOG.debug(_("Called %s for mac %s with ip %s and " - "hostname %s on interface %s"), - action, mac, ip, hostname, interface) + msg = _("Called %(action)s for mac %(mac)s with ip %(ip)s and" + " hostname %(hostname)s on interface %(interface)s") % locals() + LOG.debug(msg) globals()[action + '_lease'](mac, ip, hostname, interface) else: print init_leases(interface) diff --git a/bin/nova-spoolsentry b/bin/nova-spoolsentry index ab20268a9..c53482852 100644 --- a/bin/nova-spoolsentry +++ b/bin/nova-spoolsentry @@ -74,10 +74,8 @@ class SpoolSentry(object): return rv def send_data(self, data): - data = { - 'data': base64.b64encode(pickle.dumps(data).encode('zlib')), - 'key': self.key - } + data = {'data': base64.b64encode(pickle.dumps(data).encode('zlib')), + 'key': self.key} req = urllib2.Request(self.sentry_url) res = urllib2.urlopen(req, urllib.urlencode(data)) if res.getcode() != 200: |