Browse Source

Replace basestring with six.string_types

openstack/heat-templates has the issue but heat-agents was missing it

Change-Id: Id6da9285eeeb12b86164a080271d3f9ba40177dd
Quique Llorente 5 months ago
parent
commit
73e2125532
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      heat-config/os-refresh-config/configure.d/55-heat-config

+ 3
- 1
heat-config/os-refresh-config/configure.d/55-heat-config View File

@@ -20,6 +20,8 @@ import stat
20 20
 import subprocess
21 21
 import sys
22 22
 
23
+import six
24
+
23 25
 # legacy groups that have never had a hook script
24 26
 WHITELISTED_MISSING_HOOK_SCRIPTS = ['os-apply-config']
25 27
 HOOKS_DIR_PATHS = (
@@ -93,7 +95,7 @@ def invoke_hook(c, log):
93 95
     hot_inputs = c.get('inputs', [])
94 96
     for hot_input in hot_inputs:
95 97
         if hot_input.get('type', None) == 'String' and \
96
-                not isinstance(hot_input['value'], basestring):
98
+                not isinstance(hot_input['value'], six.string_types):
97 99
             hot_input['value'] = str(hot_input['value'])
98 100
     iv = dict((i['name'], i['value']) for i in c['inputs'])
99 101
     # The group property indicates whether it is softwarecomponent or

Loading…
Cancel
Save