Skip to content

Commit 3c514f7

Browse files
authored
Merge pull request #234 from stackhpc/upstream/yoga-2023-06-26
Synchronise yoga with upstream
2 parents 7171765 + 75f9186 commit 3c514f7

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

docker/cinder/cinder-volume/Dockerfile.j2

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

1010
{% if base_package_type == 'rpm' %}
1111
{% set cinder_volume_packages = [
12+
'lsscsi',
1213
'device-mapper-multipath',
1314
'nfs-utils',
15+
'nvme-cli',
1416
'nvmetcli',
1517
'sysfsutils',
1618
'targetcli'

kolla/image/build.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,18 @@ class Status(Enum):
8080
# is irrelevant. Otherwise all must match for skip to happen.
8181
UNBUILDABLE_IMAGES = {
8282
'aarch64': {
83-
"bifrost-base", # someone need to get upstream working first
83+
"bifrost-base", # someone need to get upstream working first
8484
"prometheus-msteams", # no aarch64 binary
85-
"prometheus-mtail", # no aarch64 binary
86-
"skydive-base", # no aarch64 binary
85+
"prometheus-mtail", # no aarch64 binary
86+
"skydive-base", # no aarch64 binary
8787
},
8888

8989
'binary': {
9090
"bifrost-base",
9191
"blazar-base",
9292
"cyborg-base",
9393
"freezer-base",
94+
"gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304
9495
"kuryr-base",
9596
"monasca-base",
9697
"monasca-thresh",
@@ -99,6 +100,7 @@ class Status(Enum):
99100
},
100101

101102
'source': {
103+
"gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304
102104
},
103105

104106
'centos': {

0 commit comments

Comments
 (0)