aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorMartin Chlumsky <martin.chlumsky@gmail.com>2018-06-26 16:18:10 -0400
committerMartin Chlumsky <martin.chlumsky@gmail.com>2018-06-26 16:18:10 -0400
commit96ca4c2f2cfaf212e7be6b629ddfb2e1d86db178 (patch)
tree7f53a75978f9aace30ac544c0903ce91cd3411d9 /kolla
parent0ea011dc3867e5f03c8b1c2896f18da35015fdde (diff)
downloadkolla-96ca4c2f2cfaf212e7be6b629ddfb2e1d86db178.tar.gz
kolla-96ca4c2f2cfaf212e7be6b629ddfb2e1d86db178.zip
kolla-build: Wrap tpl_dict.keys() in a list()
In python 3, tpl_dict.keys() returns a dict_keys object that does not support indexing and is then indexed. Wrap tpl_dict.keys() in a list() so it can be be indexed in python 2 and 3. Change-Id: I17e3bbfc4eeba58e4bdd7fdd1ecdb21baa5c4461 Closes-Bug: 1778781
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/image/build.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index a4d488d92..159fa695d 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -891,7 +891,7 @@ class KollaWorker(object):
template = env.get_template(tpl_path)
if self.conf.template_override:
tpl_dict = self._merge_overrides(self.conf.template_override)
- template_name = os.path.basename(tpl_dict.keys()[0])
+ template_name = os.path.basename(list(tpl_dict.keys())[0])
values['parent_template'] = template
env = jinja2.Environment( # nosec: not used to render HTML
loader=jinja2.DictLoader(tpl_dict))