aboutsummaryrefslogtreecommitdiff
path: root/kolla/image
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-07 08:29:06 +0000
committerGerrit Code Review <review@openstack.org>2019-06-07 08:29:06 +0000
commit03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (patch)
tree2b991061d4292373b31cb1c0a70479629c9fd9f3 /kolla/image
parente9289eaa1ca59a59c6eda79197794f42fd2d4bfc (diff)
parentd436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (diff)
downloadkolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.tar.gz
kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.zip
Merge "Debian/Ubuntu: move to Python 3 for source images"
Diffstat (limited to 'kolla/image')
-rwxr-xr-xkolla/image/build.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 7e5214ffd..e460fb006 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -699,6 +699,10 @@ class KollaWorker(object):
self.conf.distro_python_version = "2.7"
elif self.base in rh_base and self.base_tag.startswith('8'):
self.conf.distro_python_version = "3.6"
+ elif self.base in ['debian']:
+ self.conf.distro_python_version = "3.7"
+ elif self.base in ['ubuntu']:
+ self.conf.distro_python_version = "3.6"
else:
# Assume worst
self.conf.distro_python_version = "2.7"