From 1526d5838c1bdd2c2dde7f5164ade53b143dd204 Mon Sep 17 00:00:00 2001 From: Luan Nunes Utimura Date: Thu, 19 Jan 2023 16:30:22 -0300 Subject: [PATCH] Port stx-nova and stx-ceilometer to stx-debian This change enables building the stx-nova and stx-ceilometer images within the Debian build framework. It is now based on stx-debian and following the new convention for StarlingX images. Test Plan: PASS: Build both images PASS: Manually upload the built images to a system, use helm-override to change their respective containers images and reapply stx-openstack PASS: Ensure affected pods successfully start and are running PASS: Ensure affected pods liveness and readiness probes are healthy Story: 2010072 Task: 47090 Depends-On: https://review.opendev.org/c/starlingx/root/+/871314 Signed-off-by: Luan Nunes Utimura Change-Id: Ibe92ad8eb003df225dd77be60bd9c5387f1109a3 --- debian_stable_docker_images.inc | 2 ++ .../debian/stx-ceilometer.stable_docker_image | 23 ++++++++++++++ .../debian/stx-nova.stable_docker_image | 31 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image create mode 100644 openstack/python-nova/debian/stx-nova.stable_docker_image diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc index b3e3db29..665d09a6 100644 --- a/debian_stable_docker_images.inc +++ b/debian_stable_docker_images.inc @@ -1,7 +1,9 @@ openstack/python-barbican +openstack/python-ceilometer openstack/python-cinder openstack/python-glance openstack/python-heat/openstack-heat openstack/python-neutron +openstack/python-nova openstack/python-openstackclient openstack/python-platformclients diff --git a/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image b/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image new file mode 100644 index 00000000..b9620a33 --- /dev/null +++ b/openstack/python-ceilometer/debian/stx-ceilometer.stable_docker_image @@ -0,0 +1,23 @@ +BUILDER=loci +LABEL=stx-ceilometer +PROJECT=ceilometer +PROJECT_REPO=https://opendev.org/openstack/ceilometer.git +PROJECT_REF=stable/ussuri +PIP_PACKAGES="\ + gnocchiclient \ + libvirt-python \ + panko==5.0.0 +" +DIST_REPOS="OS" +DIST_PACKAGES="\ + ipmitool \ + libvirt0 \ + libvirt-clients \ + libvirt-daemon \ + libvirt-daemon-driver-lxc \ + libvirt-daemon-driver-qemu \ + libvirt-daemon-driver-storage-gluster \ + libvirt-login-shell +" +UPDATE_SYSTEM_ACCOUNT="yes" +NON_UNIQUE_SYSTEM_ACCOUNT="yes" diff --git a/openstack/python-nova/debian/stx-nova.stable_docker_image b/openstack/python-nova/debian/stx-nova.stable_docker_image new file mode 100644 index 00000000..f44c8926 --- /dev/null +++ b/openstack/python-nova/debian/stx-nova.stable_docker_image @@ -0,0 +1,31 @@ +BUILDER=loci +LABEL=stx-nova +PROJECT=nova +PROJECT_REPO=https://opendev.org/openstack/nova.git +PROJECT_REF=stable/ussuri +PIP_PACKAGES="\ + httplib2 \ + pycryptodomex \ + python-ironicclient +" +DIST_REPOS="OS" +DIST_PACKAGES="\ + e2fsprogs \ + libvirt0 \ + libvirt-clients \ + libvirt-daemon \ + libvirt-daemon-driver-lxc \ + libvirt-daemon-driver-qemu \ + libvirt-daemon-driver-storage-gluster \ + libvirt-login-shell \ + openssh-client \ + openssh-server +" +PROFILES="fluent nova ceph linuxbridge openvswitch configdrive qemu apache" +CUSTOMIZATION="\ + sed -i 's/\(^\s*\)\(import oslo_service\)/\1# \2/' /var/lib/openstack/lib/python3*/site-packages/nova/monkey_patch.py && \ + sed -i 's/\(^\s*\)\(eventlet.hubs.use_hub(\"oslo_service:service_hub\")\)/\1# \2/' /var/lib/openstack/lib/python3*/site-packages/nova/monkey_patch.py && \ + mkdir -p /run/sshd +" +UPDATE_SYSTEM_ACCOUNT="yes" +NON_UNIQUE_SYSTEM_ACCOUNT="yes"