Merge pull request #271 from raukadah/add_valkey

Add valkey container in tcib

Author: openshift-merge-bot[bot]

container-images/containers.yaml

@@ -67,6 +67,7 @@ container_images:
 - imagename: quay.io/podified-master-centos9/openstack-placement-api:current-podified
 - imagename: quay.io/podified-master-centos9/openstack-rabbitmq:current-podified
 - imagename: quay.io/podified-master-centos9/openstack-redis:current-podified
+- imagename: quay.io/podified-master-centos9/openstack-valkey:current-podified
 - imagename: quay.io/podified-master-centos9/openstack-swift-account:current-podified
 - imagename: quay.io/podified-master-centos9/openstack-swift-container:current-podified
 - imagename: quay.io/podified-master-centos9/openstack-swift-object:current-podified

container-images/kolla/base/uid_gid_manage.sh

@@ -66,6 +66,7 @@ _SUPPORTED_USERS['qemu']='qemu 107 107'
 _SUPPORTED_USERS['rabbitmq']='rabbitmq 42439 42439 /var/lib/rabbitmq kolla'
 _SUPPORTED_USERS['rally']='rally 42440 42440 /var/lib/rally kolla'
 _SUPPORTED_USERS['redis']='redis 42460 42460 /run/redis kolla'
+_SUPPORTED_USERS['valkey']='valkey 42460 42460 /run/valkey kolla'
 _SUPPORTED_USERS['swift']='swift 42445 42445 /var/lib/swift kolla'
 _SUPPORTED_USERS['tempest']='tempest 42480 42480 /var/lib/tempest kolla'
 _SUPPORTED_USERS['tobiko']='tobiko 42495 42495 /var/lib/tobiko kolla'

container-images/tcib/base/valkey/valkey.yaml

@@ -0,0 +1,9 @@
+
+tcib_actions:
+- run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
+- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
+tcib_packages:
+  common:
+  - procps-ng
+  - valkey
+tcib_user: valkey

tcib/client/container_image.py

@@ -722,6 +722,13 @@ def take_action(self, parsed_args):
 
         # Ensure anything not intended to be built is excluded
         excludes.extend(self.rectify_excludes(image_configs.keys()))
+        # For EL10, Put redis under exclude list to build valkey
+        if parsed_args.release == '10' and 'redis' not in excludes:
+            excludes.append('redis')
+        else:
+            # Exclude valkey for EL9
+            excludes.append('valkey')
+
         self.log.info("Images being excluded: {}".format(excludes))
         volumes = parsed_args.volumes
         volumes.append(