Repository: osbuild/osbuild-composer
Pull request #3176 (2022-12-08 21:25:31)

distro/rhel9: add consumer certificates on ostree rhsm option


Patch:
diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go
index 2df3dae00..814ad8c3d 100644
--- a/cmd/gen-manifests/main.go
+++ b/cmd/gen-manifests/main.go
@@ -53,6 +53,7 @@ type ostreeOptions struct {
 	Ref    string `json:"ref"`
 	URL    string `json:"url"`
 	Parent string `json:"parent"`
+	RHSM   bool   `json:"rhsm"`
 }
 
 type crBlueprint struct {
@@ -120,6 +121,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
 			URL:           cr.OSTree.URL,
 			ImageRef:      cr.OSTree.Ref,
 			FetchChecksum: cr.OSTree.Parent,
+			RHSM:          cr.OSTree.RHSM,
 		}
 	}
 
diff --git a/internal/distro/rhel9/images.go b/internal/distro/rhel9/images.go
index f5e87c149..37a8d7df2 100644
--- a/internal/distro/rhel9/images.go
+++ b/internal/distro/rhel9/images.go
@@ -218,6 +218,9 @@ func edgeCommitImage(workload workload.Workload,
 			URL:        options.OSTree.URL,
 			ContentURL: options.OSTree.ContentURL,
 		}
+		if options.OSTree.RHSM {
+			img.OSTreeParent.Secrets = "org.osbuild.rhsm.consumer"
+		}
 	}
 
 	img.OSVersion = t.arch.distro.osVersion
@@ -249,6 +252,9 @@ func edgeContainerImage(workload workload.Workload,
 			URL:        options.OSTree.URL,
 			ContentURL: options.OSTree.ContentURL,
 		}
+		if options.OSTree.RHSM {
+			img.OSTreeParent.Secrets = "org.osbuild.rhsm.consumer"
+		}
 	}
 
 	img.OSVersion = t.arch.distro.osVersion
@@ -276,6 +282,9 @@ func edgeInstallerImage(workload workload.Workload,
 		ContentURL: options.OSTree.ContentURL,
 		Checksum:   options.OSTree.FetchChecksum,
 	}
+	if options.OSTree.RHSM {
+		commit.Secrets = "org.osbuild.rhsm.consumer"
+	}
 	img := image.NewOSTreeInstaller(commit)
 
 	img.Platform = t.platform


Test patch:
diff --git a/internal/distro/distro_test_common/distro_test_common.go b/internal/distro/distro_test_common/distro_test_common.go
index 41a816afc..042edca61 100644
--- a/internal/distro/distro_test_common/distro_test_common.go
+++ b/internal/distro/distro_test_common/distro_test_common.go
@@ -95,6 +95,7 @@ func TestDistro_Manifest(t *testing.T, pipelinePath string, prefix string, regis
 						ImageRef:      tt.ComposeRequest.OSTree.Ref,
 						FetchChecksum: tt.ComposeRequest.OSTree.Parent,
 						URL:           tt.ComposeRequest.OSTree.URL,
+						RHSM:          tt.ComposeRequest.OSTree.RHSM,
 					}
 				}
 			}
diff --git a/test/data/manifests/centos_8-aarch64-edge_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_installer-boot.json
index 4eb12f66c..42207b892 100644
--- a/test/data/manifests/centos_8-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -11604,7 +11605,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json
index 02222fa3b..a464be52b 100644
--- a/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json
index 04b57b61e..c27193efb 100644
--- a/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
index 496b2a2a9..8fb76e15e 100644
--- a/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-aarch64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/centos_8-x86_64-edge_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_installer-boot.json
index c311c19a0..854262ebf 100644
--- a/test/data/manifests/centos_8-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -11854,7 +11855,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json
index 0b1526927..3b4973af3 100644
--- a/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json
index fe4b7f9eb..f4ce8cc61 100644
--- a/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
index 8ad28c40a..8d3308d12 100644
--- a/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_8-x86_64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
index 8e3957702..70343aae4 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12396,7 +12397,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
index fb4cad02a..1ca632023 100644
--- a/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json
index 6beddb0b1..bb434bb3e 100644
--- a/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
index 2a3fd039e..d06bf5958 100644
--- a/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-aarch64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
index a2a460ddb..4e450b4d8 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer-boot.json
@@ -27,7 +27,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12601,7 +12602,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
index 409de62e4..1894d60f3 100644
--- a/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_installer_with_users-boot.json
@@ -27,7 +27,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json
index a5b5eee8a..c4e98f466 100644
--- a/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_raw_image-boot.json
@@ -27,7 +27,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
index 1176e12fc..e3fc2788a 100644
--- a/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/centos_9-x86_64-edge_simplified_installer-boot.json
@@ -27,7 +27,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
index c4befaeec..59b6d7ae7 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
index 64a9ee0f6..83cd6c630 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
index 4155ed629..fca3a910e 100644
--- a/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
index 9bfd14269..350c128c4 100644
--- a/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
index 0f169a3a6..24052d44a 100644
--- a/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
index f10a625d8..13cf96ee1 100644
--- a/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
index 339ca7f45..d2c355fc7 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
index 08273a0e5..f70befd8b 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
index 5549bf91e..88e5d447d 100644
--- a/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
index b17c44ff6..f961565ee 100644
--- a/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
index fbbd890b4..a61a5a066 100644
--- a/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
index fa803e65d..32401a1fc 100644
--- a/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
@@ -35,7 +35,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
index 6efea4f0f..9b695c5bd 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
index 42a8a31d6..08bf3e09c 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
index 73a52a59c..64c84908f 100644
--- a/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
index 0026e5d4d..8b9d94964 100644
--- a/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
index 1f29bf72c..cc8bf9d3b 100644
--- a/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
index 297d050d7..a689f2d6a 100644
--- a/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
index 743a5efd4..604338ae3 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
index e79d92743..982f90bf0 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
index ce3b9b545..e8e8ab237 100644
--- a/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
index fa312eeb1..ff7b4fbcb 100644
--- a/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
index 0f39584c7..09a9db5f6 100644
--- a/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/iot",
       "url": "http://iot.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "iot-installer-users",
diff --git a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
index 790a6ed5d..fec03577f 100644
--- a/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/fedora/iot",
       "url": "http://fedora.example.com/repo",
-      "parent": ""
+      "parent": "",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json
index 8896332c0..d69bb6125 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6285,7 +6286,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json
index 1a68e7504..cffcae789 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json
index 6edf9e41d..bcc51f508 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
index 7b6105315..1053c27da 100644
--- a/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_8-aarch64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json
index a5294ac92..69078a418 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6427,7 +6428,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json
index c3f0e87ae..d3ddb5c0a 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json
index 70bd54a83..330895a47 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
index a69a31fba..f329608e9 100644
--- a/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_8-x86_64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json
index 2057285fa..6359c1fa1 100644
--- a/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6330,7 +6331,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json
index 1ec9177ab..c1c86162c 100644
--- a/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_84-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json
index 87bc96f6f..ae7be84b8 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6472,7 +6473,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json
index 64e78ecfe..b9d0e6b9b 100644
--- a/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_84-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json
index 336c4f2cd..a90905c7d 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6288,7 +6289,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json
index 336c4f2cd..d06450c05 100644
--- a/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json
index 117ff8921..cd2ad31ff 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6430,7 +6431,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json
index 117ff8921..dc2a11e55 100644
--- a/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json
index 0caf4e127..4cf69a5e8 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6285,7 +6286,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json
index cc849cae7..2e981db6b 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json
index 5ebfad1dd..703761f9c 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
index 576521e8c..14d70f0b9 100644
--- a/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-aarch64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json
index 244705343..bb0ad85df 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6427,7 +6428,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json
index 85df680d9..8a61ffffa 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json
index 2f2d27bc5..6630dc886 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
index 40830fb4b..139bd2ef4 100644
--- a/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_86-x86_64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json
index a38bfad46..31bb3cac3 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6414,7 +6415,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json
index 96f68bdd1..b7da1b142 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json
index a5338fc53..8c3e1eeae 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
index 9df9f98c5..7ea32ff23 100644
--- a/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_87-aarch64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json
index bcc6f609e..c68d44afa 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6568,7 +6569,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json
index 6cc950ae4..a9e213b9a 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json
index 2b35df60d..1a0977da3 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
index 4ff0c1eae..eda70a6c0 100644
--- a/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_87-x86_64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json
index 867fd8c08..9e106d636 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6414,7 +6415,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json
index d808db851..863185603 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json
index ed10217e4..8093c39c3 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
index d6869a55f..5a686f519 100644
--- a/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_88-aarch64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json
index c9da6b074..b0aeeb3b5 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6568,7 +6569,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json
index 41cc9036f..e9ac87fda 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json
index a34114786..2efc705ef 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
index ddd1f20a4..fe297307e 100644
--- a/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_88-x86_64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
index 4b0cec528..d4003fd85 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6495,7 +6496,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
index feb821f7c..3f526cdd4 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json
index c72aa667a..22ac86d95 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
index 2ec4774a2..36fc60626 100644
--- a/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-aarch64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
index ab95e27ab..a22939ce7 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -6606,7 +6607,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
index ac0f26e94..84dc6ea06 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_installer_with_users-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json
index eae0baee9..733feba94 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_raw_image-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
index 9ab408079..70828f36e 100644
--- a/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-edge_simplified_installer-boot.json
@@ -19,7 +19,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
index f10bdd6ec..f6bedaefd 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12544,7 +12545,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
index 8d7aa59a4..906ad8bad 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json
index 060e61408..90e6eb67e 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json
index cbb585a7d..f3000f74f 100644
--- a/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_91-aarch64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
index db62700ff..7e0fe33e9 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12730,7 +12731,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
index c90e5f05a..53545c5d6 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json
index c3bbc3e6e..fdda7d85d 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json
index 9610c70c1..4645facc7 100644
--- a/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
index a477febeb..e288834b6 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12566,7 +12567,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
index 8c90532b1..67b39a6e9 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json
index 0ff757704..295d622b8 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json
index e21b9bb8d..9f77a4677 100644
--- a/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_92-aarch64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
index 843cfad1c..d431160c0 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": true
     },
     "blueprint": {}
   },
@@ -12752,7 +12753,10 @@
         "items": {
           "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff": {
             "remote": {
-              "url": "http://edge.example.com/repo"
+              "url": "http://edge.example.com/repo",
+              "secrets": {
+                "name": "org.osbuild.rhsm.consumer"
+              }
             }
           }
         }
diff --git a/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json b/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json
index d33aa4295..f78b9d895 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_installer_with_users-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "name": "edge-installer-users",
diff --git a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json
index eb1314633..d32d0de2f 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_raw_image-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {}
   },
diff --git a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json
index 408d0b6bf..ab56ec959 100644
--- a/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json
+++ b/test/data/manifests/rhel_92-x86_64-edge_simplified_installer-boot.json
@@ -21,7 +21,8 @@
     "ostree": {
       "ref": "test/edge",
       "url": "http://edge.example.com/repo",
-      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "rhsm": false
     },
     "blueprint": {
       "customizations": {
diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index 22cbd435a..385a3cc24 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -538,7 +538,8 @@
       "ostree": {
         "ref": "test/edge",
         "url": "http://edge.example.com/repo",
-        "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "parent": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "rhsm": true
       },
       "blueprint": {}
     },