distro/rhel: move ansible-core to sap_extras_pkgset

achilleas-k · achilleas-k · commit 80852fcf0cea · 2025-06-27T19:39:45.000Z
Move ansible-core to the SAP extras package set. This removes ansible-core from the SAP Apps Azure image type. The package is included in the SAP images for the rhel-system-roles-sap package, so when we moved the system roles package out of the SAP apps image type in #1612, we should have moved ansible-core too.
diff --git a/pkg/distro/defs/rhel-10/distro.yaml b/pkg/distro/defs/rhel-10/distro.yaml
@@ -101,7 +101,6 @@
     include:
       # RHBZ#2076763
       - "@Server"
-      - "ansible-core"
       # RHBZ#1959813
       - "bind-utils"
       - "nfs-utils"
@@ -145,6 +144,7 @@
     include:
       # SAP System Roles
       # https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
+      - "ansible-core"
       - "rhel-system-roles-sap"
       # RHBZ#1960617
       - "tuned-profiles-sap-hana"
diff --git a/pkg/distro/defs/rhel-9/distro.yaml b/pkg/distro/defs/rhel-9/distro.yaml
@@ -170,7 +170,6 @@
     include:
       # RHBZ#2076763
       - "@Server"
-      - "ansible-core"
       # RHBZ#1959813
       - "bind-utils"
       - "nfs-utils"
@@ -214,6 +213,7 @@
     include:
       # SAP System Roles
       # https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
+      - "ansible-core"
       - "rhel-system-roles-sap"
       # RHBZ#1960617
       - "tuned-profiles-sap-hana"
diff --git a/test/data/manifest-checksums/rhel_10.0-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_10.0-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-4f46bed835709048f8394ee61184e6c9a02277ca
+85faef0be43a65524a2dbfb0fbfd4ae9ff0330b3
diff --git a/test/data/manifest-checksums/rhel_10.1-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_10.1-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-3d633a05c71fa344d4d87da0c55ff8f62af294af
+f7ce86d08c631d6ca6efa947325e1a317823359f
diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.0-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-4091afecfedd8f0309bb8e8dcfe185836179e90e
+1b9bbf8049a399b771999cdc41b99a63e4bbf85f
diff --git a/test/data/manifest-checksums/rhel_9.1-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.1-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-977da3f62cec60cb57302ef3ba799c4a2ecc993e
+4aeebf7799aadfa0a1db7ba0d71094ded67772ef
diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.2-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-ca06c29ef5295ad43bafd86f157056debe12d61d
+c3cec3d1b51ed0f9816d88e7926108ff0549d056
diff --git a/test/data/manifest-checksums/rhel_9.3-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.3-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-084f659c1032631aef2e5a33fd07a90c145b0d91
+912a2816a323c42040db9efaa90764f84d6e5ea0
diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.4-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-cf6a8665afe01f5bf9a9e646017a31f9a7f9615c
+3b6b72a3c27d07bd14d411a0d9539f96bed7d2a5
diff --git a/test/data/manifest-checksums/rhel_9.5-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.5-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-6ee58b7a32898049e0603b29081ac4064a3aa33e
+6c7cce5d59c4b9056a8ae735906da1529657423a
diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.6-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-841a1a9403431968f72c801b5d5d5ebebdfcd8e1
+241f3cb6abe132befd1f0b21250691c5277a353c
diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sapapps_rhui-empty_rhel b/test/data/manifest-checksums/rhel_9.7-x86_64-azure_sapapps_rhui-empty_rhel
@@ -1 +1 @@
-d1ccfde339b98e36be0486d67cf1f2d2632c1db5
+1489b8ce213b7f4c59df68263f5340de520eb909

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4f46bed835709048f8394ee61184e6c9a02277ca`
	`1`	`+85faef0be43a65524a2dbfb0fbfd4ae9ff0330b3`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3d633a05c71fa344d4d87da0c55ff8f62af294af`
	`1`	`+f7ce86d08c631d6ca6efa947325e1a317823359f`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4091afecfedd8f0309bb8e8dcfe185836179e90e`
	`1`	`+1b9bbf8049a399b771999cdc41b99a63e4bbf85f`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-977da3f62cec60cb57302ef3ba799c4a2ecc993e`
	`1`	`+4aeebf7799aadfa0a1db7ba0d71094ded67772ef`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ca06c29ef5295ad43bafd86f157056debe12d61d`
	`1`	`+c3cec3d1b51ed0f9816d88e7926108ff0549d056`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-084f659c1032631aef2e5a33fd07a90c145b0d91`
	`1`	`+912a2816a323c42040db9efaa90764f84d6e5ea0`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-cf6a8665afe01f5bf9a9e646017a31f9a7f9615c`
	`1`	`+3b6b72a3c27d07bd14d411a0d9539f96bed7d2a5`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-6ee58b7a32898049e0603b29081ac4064a3aa33e`
	`1`	`+6c7cce5d59c4b9056a8ae735906da1529657423a`