Reorganize images folder: move DIB files to dib/

Assisted-By: Claude (claude-4.5-sonnet)
Signed-off-by: Harald Jensås <hjensas@redhat.com>

Author: hjensas

images/Makefile

@@ -44,10 +44,10 @@ controller_dib_build: controller_dib_setup
 	@mkdir -p $(CONTROLLER_DIB_WORKDIR)/cache
 	@. $(CONTROLLER_DIB_VENV)/bin/activate && \
 		cd $(CURDIR) && \
-		ELEMENTS_PATH=$(CURDIR)/elements \
+		ELEMENTS_PATH=$(CURDIR)/dib/elements \
 		DIB_IMAGE_CACHE=$(CONTROLLER_DIB_WORKDIR)/cache \
 		DIB_DEBUG_TRACE=1 \
-		diskimage-builder controller-image.yaml
+		diskimage-builder dib/controller-image.yaml
 	@echo "Controller image built successfully: $(CONTROLLER_IMAGE_NAME)"
 
 controller_convert:

images/README.md

@@ -12,7 +12,7 @@ deployments. The tasks are executed using the `make` utility.
 
 - **controller**: A customized CentOS 9 Stream image with packages needed for
   the hotstack controller node. Built using diskimage-builder (DIB) with custom
-  elements.
+  elements from the `dib/` subdirectory.
 - **blank**: A minimal blank image used for virtual baremetal node disks with
   Redfish virtual BMC
 - **nat64**: A NAT64 appliance image built using ci-framework for IPv6-only
@@ -102,8 +102,8 @@ directly use qcow2 images for VM disks.
   - `controller_dib_setup`: Creates a Python virtual environment and installs
     diskimage-builder.
   - `controller_dib_build`: Builds the controller image using DIB with the
-    configuration from `controller-image.yaml` and the custom `hotstack-controller`
-    element from `elements/`.
+    configuration from `dib/controller-image.yaml` and the custom `hotstack-controller`
+    element from `dib/elements/`.
   - `controller_convert`: Converts the image to the format specified by
     `CONTROLLER_IMAGE_FORMAT` (in-place conversion if `raw`).
   - `controller_clean`: Removes the controller image, virtual environment, and
@@ -151,7 +151,7 @@ make clean
    ```
 
    This will create a Python virtual environment, install diskimage-builder,
-   build the image using the configuration from `controller-image.yaml`, and
+   build the image using the configuration from `dib/controller-image.yaml`, and
    convert it to raw format (default).
 
 2. Upload the controller image to Glance:

images/dib/README.md

@@ -0,0 +1,34 @@
+# Diskimage-builder (DIB) Files
+
+This directory contains all files related to building the HotStack controller image using diskimage-builder (DIB).
+
+## Contents
+
+- `controller-image.yaml` - DIB configuration file that defines the controller image build
+- `elements/` - Custom DIB elements for HotStack
+  - `hotstack-controller/` - Element that installs packages and configures the controller node
+- `controller.d/` - DIB manifests directory
+  - `dib-manifests/` - Contains DIB arguments and environment configuration
+
+## Building the Controller Image
+
+The controller image is built using the parent Makefile:
+
+```bash
+cd ..
+make controller
+```
+
+This will:
+1. Create a Python virtual environment with diskimage-builder
+2. Build the image using the configuration from `controller-image.yaml`
+3. Apply the custom `hotstack-controller` element from `elements/`
+4. Convert the image to the desired format (raw or qcow2)
+
+## Custom Elements
+
+See `elements/README.md` for information about creating and using custom DIB elements.
+
+## References
+
+- [diskimage-builder documentation](https://docs.openstack.org/diskimage-builder/latest/)

images/controller-image.yaml images/dib/controller-image.yamlimages/controller-image.yaml renamed to images/dib/controller-image.yaml

@@ -27,7 +27,7 @@ Custom element for building the HotStack controller node image.
 
 ## Usage
 
-These elements are used automatically by the Makefiles when building images with diskimage-builder. They are referenced in the image configuration YAML files (e.g., `controller-image.yaml`).
+These elements are used automatically by the Makefiles when building images with diskimage-builder. They are referenced in the image configuration YAML files (e.g., `../controller-image.yaml`).
 
 ## Creating New Elements