diff options
| author | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
|---|---|---|
| committer | Mike Milner <mike.milner@canonical.com> | 2012-01-17 13:39:37 -0400 |
| commit | 69d6195ec6a37dc7a8f045fc262c74d01624eb56 (patch) | |
| tree | 303ed83b05fdac41604ff3ad7c83c8c8046462eb /cloudinit/CloudConfig/cc_phone_home.py | |
| parent | f52ffe2dda01dd0314523fcac559e6f3fbb3578e (diff) | |
| parent | 1d00c0936bfc63117493d89268da8c81611b3c40 (diff) | |
| download | vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.tar.gz vyos-cloud-init-69d6195ec6a37dc7a8f045fc262c74d01624eb56.zip | |
Merge from trunk.
Diffstat (limited to 'cloudinit/CloudConfig/cc_phone_home.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_phone_home.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/CloudConfig/cc_phone_home.py b/cloudinit/CloudConfig/cc_phone_home.py index f291e1d4..7897d31b 100644 --- a/cloudinit/CloudConfig/cc_phone_home.py +++ b/cloudinit/CloudConfig/cc_phone_home.py @@ -31,7 +31,7 @@ post_list_all = [ 'pub_key_dsa', 'pub_key_rsa', 'pub_key_ecdsa', 'instance_id', # url: http://my.foo.bar/$INSTANCE_ID/ # post: [ pub_key_dsa, pub_key_rsa, pub_key_ecdsa, instance_id # -def handle(name,cfg,cloud,log,args): +def handle(_name,cfg,cloud,log,args): if len(args) != 0: ph_cfg = util.readconf(args[0]) else: @@ -68,7 +68,6 @@ def handle(name,cfg,cloud,log,args): try: fp = open(path, "rb") all_keys[n] = fp.read() - all_keys[n] fp.close() except: log.warn("%s: failed to open in phone_home" % path) |