Skip to content

Commit a015a76

Browse files
cityofshipscityofships
authored
Merge pull request #99 from stackhpc/sync/gerrit/stable/victoria
Sync/gerrit/stable/victoria
2 parents 42af7c3 + 6f01297 commit a015a76

40 files changed

+246
-217
lines changed

‎.zuul.d/base.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
LfDhCLDD3VtnVOrj4UxZsjzmPbday1fziua/7f+CXsShC5erz0ZM65rMCwkjWeI6Kc63A
5252
0M27tl+OWHO3KkfFR4tWc3dws3r1kYjQeds0adBHyYD0eL8SJfwZkbtojAQ1JM=
5353

54-
- nodeset:
55-
name: kolla-centos8
56-
nodes:
57-
- name: primary
58-
label: centos-8
59-
6054
- nodeset:
6155
name: kolla-centos8-stream
6256
nodes:
@@ -75,12 +69,6 @@
7569
- name: primary
7670
label: debian-buster
7771

78-
- nodeset:
79-
name: kolla-centos8-aarch64
80-
nodes:
81-
- name: primary
82-
label: centos-8-arm64
83-
8472
- nodeset:
8573
name: kolla-centos8-stream-aarch64
8674
nodes:

‎.zuul.d/centos.yaml‎

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,34 @@
22
- project:
33
check:
44
jobs:
5-
- kolla-build-centos8-binary
6-
- kolla-build-centos8-source
75
- kolla-build-centos8s-binary
86
- kolla-build-centos8s-source
9-
- kolla-ansible-centos8-source
10-
- kolla-ansible-centos8-binary
11-
- kolla-ansible-centos8-source-upgrade
127
- kolla-ansible-centos8s-source
138
- kolla-ansible-centos8s-binary
149
- kolla-ansible-centos8s-source-upgrade
1510
check-arm64:
1611
jobs:
17-
- kolla-build-centos8-source-aarch64
1812
- kolla-build-centos8s-source-aarch64
1913
gate:
2014
queue: kolla
2115
jobs:
22-
- kolla-build-centos8-source
2316
- kolla-build-centos8s-source
24-
- kolla-ansible-centos8-source
25-
- kolla-ansible-centos8-source-upgrade
2617
- kolla-ansible-centos8s-source
2718
- kolla-ansible-centos8s-source-upgrade
2819
periodic:
2920
jobs:
30-
- kolla-publish-centos8-source-quay
31-
- kolla-publish-centos8-binary-quay
3221
- kolla-publish-centos8s-source-quay
3322
- kolla-publish-centos8s-binary-quay
3423
periodic-weekly:
3524
jobs:
36-
- kolla-publish-centos8-source-dockerhub
37-
- kolla-publish-centos8-binary-dockerhub
3825
- kolla-publish-centos8s-source-dockerhub
3926
- kolla-publish-centos8s-binary-dockerhub
4027
release:
4128
jobs:
42-
- kolla-publish-centos8-source-dockerhub
43-
- kolla-publish-centos8-binary-dockerhub
4429
- kolla-publish-centos8s-source-dockerhub
4530
- kolla-publish-centos8s-binary-dockerhub
4631
experimental:
4732
jobs:
48-
- kolla-build-no-infra-wheels-centos8-source
49-
- kolla-ansible-centos8-source-bifrost:
50-
files: ^docker\/(base|bifrost|openstack-base)\/.*
51-
# Test rabbitmq & mariadb changes in multinode ceph jobs.
52-
- kolla-ansible-centos8-source-ceph-ansible:
53-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
54-
- kolla-ansible-centos8-source-upgrade-ceph-ansible:
55-
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
56-
- kolla-ansible-centos8-source-zun:
57-
files: ^docker\/(base|cinder|etcd|iscsid|kuryr|openstack-base|zun)\/.*
58-
- kolla-ansible-centos8-source-scenario-nfv:
59-
files: ^docker\/(base|barbican|heat|mistral|openstack-base|redis|tacker)\/.*
60-
- kolla-ansible-centos8-source-ironic:
61-
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
62-
- kolla-ansible-centos8-source-swift:
63-
files: ^docker/(base|openstack-base|glance|swift)/
64-
- kolla-ansible-centos8-source-mariadb:
65-
files: ^docker/(base|mariadb)/
66-
- kolla-ansible-centos8-source-masakari:
67-
files: ^docker/(base|masakari)/
68-
- kolla-ansible-centos8-source-ovn:
69-
files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
70-
- kolla-ansible-centos8-source-prometheus-efk:
71-
files: ^docker/(base|elasticsearch|grafana|kibana|prometheus)/
72-
- kolla-ansible-centos8-source-kvm:
73-
files: ^docker/nova/
7433
- kolla-ansible-centos8s-source-bifrost:
7534
files: ^docker\/(base|bifrost|openstack-base)\/.*
7635
# Test rabbitmq & mariadb changes in multinode ceph jobs.
@@ -97,15 +56,6 @@
9756
- kolla-ansible-centos8s-source-kvm:
9857
files: ^docker/nova/
9958

100-
- job:
101-
name: kolla-build-centos8-binary
102-
parent: kolla-base
103-
nodeset: kolla-centos8
104-
voting: false
105-
vars:
106-
base_distro: centos
107-
install_type: binary
108-
10959
- job:
11060
name: kolla-build-centos8s-binary
11161
parent: kolla-base
@@ -117,17 +67,6 @@
11767
base_tag: stream8
11868
install_type: binary
11969

120-
- job:
121-
name: kolla-publish-centos8-binary-dockerhub
122-
parent: kolla-build-centos8-binary
123-
post-run: tests/playbooks/publish.yml
124-
vars:
125-
publisher: true
126-
kolla_registry: dockerhub
127-
kolla_namespace: kolla
128-
secrets:
129-
- kolla_dockerhub_creds
130-
13170
- job:
13271
name: kolla-publish-centos8s-binary-dockerhub
13372
parent: kolla-build-centos8s-binary
@@ -139,17 +78,6 @@
13978
secrets:
14079
- kolla_dockerhub_creds
14180

142-
- job:
143-
name: kolla-publish-centos8-binary-quay
144-
parent: kolla-build-centos8-binary
145-
post-run: tests/playbooks/publish.yml
146-
vars:
147-
publisher: true
148-
kolla_registry: quay.io
149-
kolla_namespace: openstack.kolla
150-
secrets:
151-
- kolla_quay_io_creds
152-
15381
- job:
15482
name: kolla-publish-centos8s-binary-quay
15583
parent: kolla-build-centos8s-binary
@@ -161,14 +89,6 @@
16189
secrets:
16290
- kolla_quay_io_creds
16391

164-
- job:
165-
name: kolla-build-centos8-source
166-
parent: kolla-base
167-
nodeset: kolla-centos8
168-
vars:
169-
base_distro: centos
170-
install_type: source
171-
17292
- job:
17393
name: kolla-build-centos8s-source
17494
parent: kolla-base
@@ -179,29 +99,12 @@
17999
base_tag: stream8
180100
install_type: source
181101

182-
- job:
183-
name: kolla-build-centos8-source-aarch64
184-
parent: kolla-build-centos8-source
185-
nodeset: kolla-centos8-aarch64
186-
voting: false
187-
188102
- job:
189103
name: kolla-build-centos8s-source-aarch64
190104
parent: kolla-build-centos8s-source
191105
nodeset: kolla-centos8-stream-aarch64
192106
voting: false
193107

194-
- job:
195-
name: kolla-publish-centos8-source-dockerhub
196-
parent: kolla-build-centos8-source
197-
post-run: tests/playbooks/publish.yml
198-
vars:
199-
publisher: true
200-
kolla_registry: dockerhub
201-
kolla_namespace: kolla
202-
secrets:
203-
- kolla_dockerhub_creds
204-
205108
- job:
206109
name: kolla-publish-centos8s-source-dockerhub
207110
parent: kolla-build-centos8s-source
@@ -213,17 +116,6 @@
213116
secrets:
214117
- kolla_dockerhub_creds
215118

216-
- job:
217-
name: kolla-publish-centos8-source-quay
218-
parent: kolla-build-centos8-source
219-
post-run: tests/playbooks/publish.yml
220-
vars:
221-
publisher: true
222-
kolla_registry: quay.io
223-
kolla_namespace: openstack.kolla
224-
secrets:
225-
- kolla_quay_io_creds
226-
227119
- job:
228120
name: kolla-publish-centos8s-source-quay
229121
parent: kolla-build-centos8s-source
@@ -234,11 +126,3 @@
234126
kolla_namespace: openstack.kolla
235127
secrets:
236128
- kolla_quay_io_creds
237-
238-
- job:
239-
name: kolla-build-no-infra-wheels-centos8-source
240-
parent: kolla-build-no-infra-wheels-base
241-
nodeset: kolla-centos8
242-
vars:
243-
base_distro: centos
244-
install_type: source

‎doc/source/admin/image-building.rst‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@ See the :ref:`support matrix <support-matrix-base-images>` for information on
7878
supported base image distribution versions and supported images on each
7979
distribution.
8080

81-
The Victoria release supports both CentOS 8 Linux and CentOS 8 Stream base
82-
container images. The default is to use CentOS 8 Linux. CentOS 8 Stream
83-
may be used as follows:
84-
85-
.. code-block:: console
86-
87-
kolla-build --base centos --base-image quay.io/centos/centos --base-tag stream8
88-
8981
It is possible to build only a subset of images by specifying them on the
9082
command line:
9183

‎doc/source/support_matrix.rst‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,14 @@ The following base container images are supported:
1919
CentOS 7 is no longer supported as a base container image. The Train release
2020
supports both CentOS 7 and 8 images, and provides a route for migration.
2121

22+
.. note::
23+
24+
CentOS 8 is no longer supported since it has been marked as End of Life
25+
and repositories have been removed from CentOS mirrors.
26+
2227
=============== ============ =============================== ================
2328
Distribution Default base Default base image Default base tag
2429
=============== ============ =============================== ================
25-
CentOS 8 Linux centos centos 8
2630
CentOS 8 Stream centos quay.io/centos/centos stream8
2731
Debian Buster debian debian 10
2832
RHEL 8 rhel rhel 8

‎docker/base/Dockerfile.j2‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,14 @@ COPY dnf.conf /etc/dnf/dnf.conf
9292
{% elif base_arch == 'aarch64' %}
9393
{% set base_yum_repo_files = [
9494
'elasticsearch.repo',
95+
'erlang-solutions.repo',
9596
'grafana.repo',
9697
'rabbitmq_rabbitmq-server.repo',
9798
'td.repo',
9899
] %}
99100

100101
{% set base_yum_repo_keys = [
102+
'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc',
101103
'https://packages.grafana.com/gpg.key',
102104
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
103105
] %}
@@ -213,6 +215,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
213215
'centos-ceph-nautilus',
214216
'centos-opstools',
215217
'centos-rabbitmq-38',
218+
'epel',
219+
'epel-modular',
216220
] %}
217221

218222
{% if base_arch == 'x86_64' %}
@@ -361,17 +365,18 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
361365
'F77F1EDA57EBB1CC',
362366
'F6609E60DC62814E',
363367
] %}
364-
{% set remote_apt_keys = [
368+
{% set base_remote_apt_keys = [
365369
'https://packages.grafana.com/gpg.key',
366370
'https://repos.influxdata.com/influxdb.key',
367371
] %}
368372
{% elif base_distro == 'debian' %}
369373
{% set base_apt_keys = [
370374
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
375+
'F1656F24C74CD1D8',
371376
'F77F1EDA57EBB1CC',
372377
'F6609E60DC62814E',
373378
] %}
374-
{% set remote_apt_keys = [
379+
{% set base_remote_apt_keys = [
375380
'https://download.docker.com/linux/debian/gpg',
376381
'https://packages.grafana.com/gpg.key',
377382
'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg',
@@ -391,7 +396,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
391396
{%- if not loop.last %} \
392397
{% endif -%}
393398
{% endfor %}
394-
{% for key in remote_apt_keys | customizable('remote_apt_keys') %}
399+
{% for key in base_remote_apt_keys | customizable('remote_apt_keys') %}
395400
{%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
396401
{%- if not loop.last %} \
397402
{% endif -%}

‎docker/base/erlang-solutions.repo‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[erlang-solutions]
2+
name=erlang-solutions
3+
baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch
4+
gpgcheck=1
5+
gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc
6+
enabled=0

‎docker/base/set_configs.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import os
2121
import pwd
2222
import shutil
23+
import stat
2324
import sys
2425

2526

@@ -369,6 +370,15 @@ def set_perms(path, uid, gid, perm):
369370
perm = ''.join([perm[:1], 'o', perm[1:]])
370371
perm = int(perm, base=0)
371372

373+
# Ensure execute bit on directory if read bit is set
374+
if os.path.isdir(path):
375+
if perm & stat.S_IRUSR:
376+
perm |= stat.S_IXUSR
377+
if perm & stat.S_IRGRP:
378+
perm |= stat.S_IXGRP
379+
if perm & stat.S_IROTH:
380+
perm |= stat.S_IXOTH
381+
372382
try:
373383
os.chmod(path, perm)
374384
except OSError:

‎docker/cinder/cinder-volume/Dockerfile.j2‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
2323

2424
{% elif base_package_type == 'deb' %}
2525
{% set cinder_volume_packages = [
26+
'lsscsi',
2627
'nfs-common',
28+
'nvme-cli',
2729
'sysfsutils',
2830
'python3-rtslib-fb',
2931
'targetcli-fb',

0 commit comments

Comments
 (0)