From b46e751573e48f1a217c1004618d44bcb948266a Mon Sep 17 00:00:00 2001
From: rptaylor <1686627+rptaylor@users.noreply.github.com>
Date: Tue, 1 Jun 2021 08:24:27 -0700
Subject: [PATCH] protect against TypeError in case of NoneType (#7659)
---
contrib/terraform/terraform.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/terraform/terraform.py b/contrib/terraform/terraform.py
index 10ab3bd8f..537dc62f4 100755
--- a/contrib/terraform/terraform.py
+++ b/contrib/terraform/terraform.py
@@ -323,11 +323,11 @@ def openstack_host(resource, module_name):
})
# add groups based on attrs
- groups.append('os_image=' + attrs['image']['id'])
- groups.append('os_flavor=' + attrs['flavor']['name'])
+ groups.append('os_image=' + str(attrs['image']['id']))
+ groups.append('os_flavor=' + str(attrs['flavor']['name']))
groups.extend('os_metadata_%s=%s' % item
for item in list(attrs['metadata'].items()))
- groups.append('os_region=' + attrs['region'])
+ groups.append('os_region=' + str(attrs['region']))
# groups specific to kubespray
for group in attrs['metadata'].get('kubespray_groups', "").split(","):
--
GitLab