From 73e2125532a6d68dbd5d8a4e64a043de859eb853 Mon Sep 17 00:00:00 2001 From: Quique Llorente Date: Tue, 6 Nov 2018 12:21:15 +0100 Subject: [PATCH] Replace basestring with six.string_types openstack/heat-templates has the issue but heat-agents was missing it Change-Id: Id6da9285eeeb12b86164a080271d3f9ba40177dd --- heat-config/os-refresh-config/configure.d/55-heat-config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/heat-config/os-refresh-config/configure.d/55-heat-config b/heat-config/os-refresh-config/configure.d/55-heat-config index 37452a6..5baa880 100755 --- a/heat-config/os-refresh-config/configure.d/55-heat-config +++ b/heat-config/os-refresh-config/configure.d/55-heat-config @@ -20,6 +20,8 @@ import stat import subprocess import sys +import six + # legacy groups that have never had a hook script WHITELISTED_MISSING_HOOK_SCRIPTS = ['os-apply-config'] HOOKS_DIR_PATHS = ( @@ -93,7 +95,7 @@ def invoke_hook(c, log): hot_inputs = c.get('inputs', []) for hot_input in hot_inputs: if hot_input.get('type', None) == 'String' and \ - not isinstance(hot_input['value'], basestring): + not isinstance(hot_input['value'], six.string_types): hot_input['value'] = str(hot_input['value']) iv = dict((i['name'], i['value']) for i in c['inputs']) # The group property indicates whether it is softwarecomponent or