Merge "Debian/Ubuntu: move to Python 3 for source images"

3 files changed, 6 insertions, 6 deletions

diff --git a/kolla/common/config.py b/kolla/common/config.py
index be40613ef..b31ab2068 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -628,10 +628,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
                      'networking-sfc-master.tar.gz')},
-    'neutron-server-plugin-networking-infoblox': {
-        'type': 'url',
-        'location': ('$tarballs_base/networking-infoblox/'
-                     'networking-infoblox-master.tar.gz')},
     'neutron-server-plugin-neutron-dynamic-routing': {
         'type': 'url',
         'location': ('$tarballs_base/neutron-dynamic-routing/'
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"
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 1a0cef8c3..ec4ab8f54 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -385,7 +385,7 @@ class KollaWorkerTest(base.TestCase):
         """check distro_python_version for Debian"""
         self.conf.set_override('base', 'debian')
         kolla = build.KollaWorker(self.conf)
-        self.assertEqual('2.7', kolla.distro_python_version)
+        self.assertEqual('3.7', kolla.distro_python_version)
 
     def test_build_distro_python_version_rhel80(self):
         """check distro_python_version for RHEL8.0"""
@@ -405,7 +405,7 @@ class KollaWorkerTest(base.TestCase):
         """check distro_python_version for Ubuntu"""
         self.conf.set_override('base', 'ubuntu')
         kolla = build.KollaWorker(self.conf)
-        self.assertEqual('2.7', kolla.distro_python_version)
+        self.assertEqual('3.6', kolla.distro_python_version)
 
     def test_build_distro_python_version_centos7(self):
         """check distro_python_version for CentOS 7.6.1810"""