Skip to content

Commit 766103f

Browse files
committed
Add valkey container in tcib
This pr adds: - Add valkey container in tcib - since valkey is a replacement of redis in RHEL10. So, it also modifies excludes to add redis for el10 and valkey for el9. Signed-off-by: Chandan Kumar (raukadah) <[email protected]> Co-authored by: Luca Miccini <[email protected]>
1 parent 7c69b98 commit 766103f

File tree

4 files changed

+18
-0
lines changed

4 files changed

+18
-0
lines changed

container-images/containers.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ container_images:
6767
- imagename: quay.io/podified-master-centos9/openstack-placement-api:current-podified
6868
- imagename: quay.io/podified-master-centos9/openstack-rabbitmq:current-podified
6969
- imagename: quay.io/podified-master-centos9/openstack-redis:current-podified
70+
- imagename: quay.io/podified-master-centos9/openstack-valkey:current-podified
7071
- imagename: quay.io/podified-master-centos9/openstack-swift-account:current-podified
7172
- imagename: quay.io/podified-master-centos9/openstack-swift-container:current-podified
7273
- imagename: quay.io/podified-master-centos9/openstack-swift-object:current-podified

container-images/kolla/base/uid_gid_manage.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ _SUPPORTED_USERS['qemu']='qemu 107 107'
6666
_SUPPORTED_USERS['rabbitmq']='rabbitmq 42439 42439 /var/lib/rabbitmq kolla'
6767
_SUPPORTED_USERS['rally']='rally 42440 42440 /var/lib/rally kolla'
6868
_SUPPORTED_USERS['redis']='redis 42460 42460 /run/redis kolla'
69+
_SUPPORTED_USERS['valkey']='valkey 42460 42460 /run/valkey kolla'
6970
_SUPPORTED_USERS['swift']='swift 42445 42445 /var/lib/swift kolla'
7071
_SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
7172
_SUPPORTED_USERS['tobiko']='tobiko 42495 42495 /var/lib/tobiko kolla'
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
tcib_actions:
3+
- run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
4+
- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
5+
tcib_packages:
6+
common:
7+
- procps-ng
8+
- valkey
9+
tcib_user: valkey

tcib/client/container_image.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,13 @@ def take_action(self, parsed_args):
722722

723723
# Ensure anything not intended to be built is excluded
724724
excludes.extend(self.rectify_excludes(image_configs.keys()))
725+
# For EL10, Put redis under exclude list to build valkey
726+
if parsed_args.release == '10' and 'redis' not in excludes:
727+
excludes.append('redis')
728+
else:
729+
# Exclude valkey for EL9
730+
excludes.append('valkey')
731+
725732
self.log.info("Images being excluded: {}".format(excludes))
726733
volumes = parsed_args.volumes
727734
volumes.append(

0 commit comments

Comments
 (0)