diff options
| author | Rick Harris <rick.harris@rackspace.com> | 2011-01-25 21:46:12 +0000 |
|---|---|---|
| committer | Rick Harris <rick.harris@rackspace.com> | 2011-01-25 21:46:12 +0000 |
| commit | 9fac0cefb1ba4d7ffa85315a3843ef70ce37691c (patch) | |
| tree | 2c9fb564896647b3c25627a4b27682bd7530fb53 /bin | |
| parent | a9ab2d0f0618f855686cb8713b28c3737faabdcc (diff) | |
| parent | 705cbaa3d311c21cf2a7318e52a60eeadebb435a (diff) | |
Merge trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-api | 2 | ||||
| -rwxr-xr-x | bin/nova-dhcpbridge | 6 | ||||
| -rwxr-xr-x | bin/nova-manage | 9 | ||||
| -rw-r--r-- | bin/nova-spoolsentry | 6 |
4 files changed, 12 insertions, 11 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-manage b/bin/nova-manage index a347e86ce..1c885f8a6 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -473,9 +473,12 @@ class NetworkCommands(object): fixed_range_v6 = FLAGS.fixed_range_v6 net_manager = utils.import_object(FLAGS.network_manager) net_manager.create_networks(context.get_admin_context(), - fixed_range, int(num_networks), - int(network_size), int(vlan_start), - int(vpn_start), fixed_range_v6) + cidr=fixed_range, + num_networks=int(num_networks), + network_size=int(network_size), + vlan_start=int(vlan_start), + vpn_start=int(vpn_start), + cidr_v6=fixed_range_v6) class ServiceCommands(object): 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: |