diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
| commit | 573ee6d9d641356374ac616f53cb254d4da7c9db (patch) | |
| tree | e96228256276875c47c5031160bd2f3cbe3b5398 /cloudinit/sources/DataSourceAzure.py | |
| parent | 1781668dd65737a800c2c8fdbb79c6f1288d3ef2 (diff) | |
| parent | c833a84f08019ba4413937f2f1b1f12a4ffe5632 (diff) | |
| download | vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.tar.gz vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceAzure.py')
| -rw-r--r-- | cloudinit/sources/DataSourceAzure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py index b18c57e7..97f151d6 100644 --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py @@ -154,7 +154,7 @@ class DataSourceAzureNet(sources.DataSource): fp_files = [] for pk in self.cfg.get('_pubkeys', []): - bname = pk['fingerprint'] + ".crt" + bname = str(pk['fingerprint'] + ".crt") fp_files += [os.path.join(mycfg['data_dir'], bname)] missing = util.log_time(logfunc=LOG.debug, msg="waiting for files", @@ -247,7 +247,7 @@ def pubkeys_from_crt_files(flist): try: pubkeys.append(crtfile_to_pubkey(fname)) except util.ProcessExecutionError: - errors.extend(fname) + errors.append(fname) if errors: LOG.warn("failed to convert the crt files to pubkey: %s" % errors) |