From 6c8979720a6d96dbdd8c7e9203f5db56f6d04548 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 6 Jan 2020 07:26:15 -0500 Subject: [PATCH] image_uploader/base handle when an image has null labels We missed to patch the _inspect method in BaseUploader when we did: I67ca5956a44c3ee908e21dcf3b476e2c6c5c7f9e This patch addresses that. Change-Id: I7986c585160af2534365d8aff0a3e0d95cd356f4 Related-Bug: #1857012 --- tripleo_common/image/image_uploader.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tripleo_common/image/image_uploader.py b/tripleo_common/image/image_uploader.py index e6a3a87c3..5b6d47de4 100644 --- a/tripleo_common/image/image_uploader.py +++ b/tripleo_common/image/image_uploader.py @@ -679,6 +679,9 @@ class BaseImageUploader(object): created = config['created'] docker_version = config.get('docker_version', '') labels = config['config'].get('Labels', {}) + # NOTE: labels can be null + if labels is None: + labels = {} architecture = config['architecture'] image_os = config['os']