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. 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
This commit is contained in:
parent
58a8e81897
commit
4d11cd647a
|
@ -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',
|
||||
|
|
|
@ -23,6 +23,7 @@ RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-
|
|||
|
||||
RUN sed -i -e "/^mirrorlist/d" \
|
||||
-e "s|^#baseurl=http://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||
-e "s|^#baseurl=https://mirror.centos.org|baseurl=http://{{ nodepool_mirror_host }}|" \
|
||||
/etc/yum.repos.d/CentOS-Base.repo
|
||||
|
||||
{% raw %}
|
||||
|
|
Loading…
Reference in New Issue