diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-01-15 15:08:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-01-15 15:08:28 -0500 |
| commit | 12b0b69b8e93555b0a60cab6a7bada93aab857f4 (patch) | |
| tree | e550c8bf18b2cfa4bd6abf3491429ed81492f66e /cloudinit | |
| parent | 9874d0590dba4a67ff7268a6a1d22207088e1a13 (diff) | |
| parent | 08b50a6ea239f480493f202c563d788cabb92380 (diff) | |
| download | vyos-cloud-init-12b0b69b8e93555b0a60cab6a7bada93aab857f4.tar.gz vyos-cloud-init-12b0b69b8e93555b0a60cab6a7bada93aab857f4.zip | |
merge from trunk
Diffstat (limited to 'cloudinit')
| -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) |