diff options
| author | Scott Moser <smoser@brickies.net> | 2017-03-03 02:26:38 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-03-03 02:26:38 -0500 |
| commit | d7004bcf269fe60e456de336ecda9a9d2fe50bfd (patch) | |
| tree | cf49b1fbc06388d46fa435814d24d97c83476047 /cloudinit/ec2_utils.py | |
| parent | 1de8720effd029727bb5ef7972e7e4d859a1b53a (diff) | |
| parent | c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a (diff) | |
| download | vyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.tar.gz vyos-cloud-init-d7004bcf269fe60e456de336ecda9a9d2fe50bfd.zip | |
merge from master at 0.7.9-47-gc81ea53
Diffstat (limited to 'cloudinit/ec2_utils.py')
| -rw-r--r-- | cloudinit/ec2_utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py index c656ef14..13691549 100644 --- a/cloudinit/ec2_utils.py +++ b/cloudinit/ec2_utils.py @@ -28,7 +28,7 @@ class MetadataLeafDecoder(object): def __call__(self, field, blob): if not blob: - return blob + return '' try: blob = util.decode_binary(blob) except UnicodeDecodeError: @@ -82,6 +82,9 @@ class MetadataMaterializer(object): field_name = get_name(field) if not field or not field_name: continue + # Don't materialize credentials + if field_name == 'security-credentials': + continue if has_children(field): if field_name not in children: children.append(field_name) |