summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-04-02 14:34:36 +0100
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-04-03 12:01:54 +0000
commit519eced6147085151a3e53a55c734c28d1e35eeb (patch)
tree495e923a5d6f928d141aec07a87e778b7fd7b6da /docker
parent58a8e81897a12e95f1b75c058e57afafd705b828 (diff)
downloadkolla-519eced6147085151a3e53a55c734c28d1e35eeb.tar.gz
kolla-519eced6147085151a3e53a55c734c28d1e35eeb.zip
Fix multiple CI issues
1. Pin openstacksdk and client libraries in kolla-toolbox Stein and below only. openstacksdk released 0.45.0 (and possibly 0.44.0 as well) which dropped py2 compat but did not advertise the fact. It was amended later but it will now always affect kolla images until pinned to older. The observable error is: "ImportError: No module named queue" Since Train we pin u-c, but not before that. This change introduces a version constraint for openstacksdk and client libs: - python-novaclient - python-cinderclient - python-keystoneclient - python-glanceclient 2. Make deploy jobs non-voting For similar reasons to 1., the deploy jobs fail when using the openstack client for testing. Due to a dependency loop between these two projects, we must make these jobs non-voting to fix the image build. This should be reverted ASAP. 3. CI: Add https match for mirror.centos.org to template-overrides Some CentOS repos (currently one - Ceph NFS Ganesha) use https://mirror.centos.org instead of http:// and we break their definition by removing mirrorlist= entry and not inserting baseurl entry due to a missing match. Original Change-Id: I7b29f8c6be80820042023d2b85162d5cc9a65f08 Change-Id: I8c2da6437333210a7926f2deb926ab5d1c93c3c6 Closes-Bug: #1870349
Diffstat (limited to 'docker')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 479448e72..ef72da3dc 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -64,9 +64,14 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
'"cmd2<0.9.0"',
'influxdb',
'mysqlclient',
+ '"openstacksdk<0.28.0"',
'os-client-config==1.29.0',
'pbr==4.0.0',
'pymongo',
+ '"python-cinderclient<5.0.0"',
+ '"python-glanceclient<2.17.0"',
+ '"python-keystoneclient<3.20.0"',
+ '"python-novaclient<14.0.0"',
'python-openstackclient==3.14.0',
'pytz',
'pyudev',