From ce403472f4b6b3b421ec6986f69c16e9daa0b203 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 2 Jan 2020 15:57:34 -0500
Subject: [PATCH] image_uploader: handle when an image has null labels

If an image inspect returns empty Labels, set the labels to an empty
dictionary.

Change-Id: I67ca5956a44c3ee908e21dcf3b476e2c6c5c7f9e
Closes-Bug: #1857012
Co-Authored-By: Alex Schultz <aschultz@redhat.com>
(cherry picked from commit faec3e0801baeb310f43f7f36dfa16433d3f3be6)
---
 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 3283dd71a..2b4ae99e2 100644
--- a/tripleo_common/image/image_uploader.py
+++ b/tripleo_common/image/image_uploader.py
@@ -2117,6 +2117,9 @@ class PythonImageUploader(BaseImageUploader):
         digest = image['digest']
         created = image['created']
         labels = config['config'].get('Labels', {})
+        # NOTE: labels can be null
+        if labels is None:
+            labels = {}
         architecture = config['architecture']
         image_os = config['os']
         return {