Merge pull request #23 from steveb/fips-rhel

Add separate yaml files just to enable the fips element
openstack-k8s-operators · Feb 15, 2024 · 6de23c7 · 6de23c7
2 parents 962c584 + 9fc3288
commit 6de23c7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/README.rst b/README.rst
@@ -26,6 +26,11 @@ master branch ``current-podified`` by running::
 
     diskimage-builder ./images/edpm-hardened-uefi-centos-9-stream.yaml
 
+To create a FIPS enabled image, add ``edpm-hardened-uefi-fips.yaml`` to
+include the ``fips`` element::
+
+    diskimage-builder ./images/edpm-hardened-uefi-centos-9-stream.yaml ./images/edpm-hardened-uefi-fips.yaml
+
 See dib/repo-setup/README.md for environment variables to control which RDO
 repositories to configure.
 

diff --git a/images/edpm-hardened-uefi-fips.yaml b/images/edpm-hardened-uefi-fips.yaml
@@ -0,0 +1,4 @@
+- imagename: edpm-hardened-uefi
+  elements:
+  # Additional element to enable fips for other image defintion
+  - fips
diff --git a/images/edpm-hardened-uefi-rhel-9.yaml b/images/edpm-hardened-uefi-rhel-9.yaml
@@ -11,7 +11,6 @@
   - modprobe
   - disable-nouveau
   - reset-bls-entries
-  - fips
   # edpm-image-builder elements
   - edpm-base
   - edpm-partition-uefi

diff --git a/images/ironic-python-agent-fips.yaml b/images/ironic-python-agent-fips.yaml
@@ -0,0 +1,4 @@
+- imagename: ironic-python-agent
+  elements:
+  # Additional element to enable fips for other image defintion
+  - fips