Merge pull request #194 from lmiccini/redis

Revert "remove redis"
openstack-k8s-operators · Aug 5, 2024 · 1fefc91 · 1fefc91
2 parents 6de9922 + 7d81830
commit 1fefc91
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/container-images/containers.yaml b/container-images/containers.yaml
@@ -66,6 +66,7 @@ container_images:
 - imagename: quay.io/podified-master-centos9/openstack-ovn-sb-db-server:current-podified
 - 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-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

diff --git a/container-images/kolla/base/uid_gid_manage.sh b/container-images/kolla/base/uid_gid_manage.sh
@@ -66,6 +66,7 @@ _SUPPORTED_USERS['placement']='placement 42482 42482 /var/lib/placement kolla'
 _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['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'

diff --git a/container-images/tcib/base/redis/redis.yaml b/container-images/tcib/base/redis/redis.yaml
@@ -0,0 +1,8 @@
+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
+  - redis
+tcib_user: redis
diff --git a/tcib/client/container_image.py b/tcib/client/container_image.py
@@ -39,7 +39,7 @@
 DEFAULT_ENV_AUTHFILE = os.environ.get("REGISTRY_AUTH_FILE", DEFAULT_AUTHFILE)
 DEFAULT_CONFIG = "containers.yaml"
 DEFAULT_TCIB_CONFIG_BASE = "tcib"
-SUPPORTED_RHEL_MODULES = ['container-tools', 'mariadb', 'virt']
+SUPPORTED_RHEL_MODULES = ['container-tools', 'mariadb', 'redis', 'virt']
 DEFAULT_CONTAINER_NAMESPACE = "podified-master-centos9"
 SHARE_BASE_PATH = os.path.join(sys.prefix, 'share')
 CONTAINER_IMAGES_BASE_PATH = os.path.join(