From 647a24845391d7f076f350177ca95b9785bc7c21 Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 2 Jan 2025 14:48:33 +0100 Subject: [PATCH 1/3] Show custom EL7+EL6 images for Satellite only --- guides/common/assembly_building_cloud-images.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guides/common/assembly_building_cloud-images.adoc b/guides/common/assembly_building_cloud-images.adoc index 4001d729226..a638719189b 100644 --- a/guides/common/assembly_building_cloud-images.adoc +++ b/guides/common/assembly_building_cloud-images.adoc @@ -10,8 +10,10 @@ include::modules/proc_registering-a-host.adoc[leveloffset=+1] include::modules/proc_installing-and-configuring-puppet-agent-manually.adoc[leveloffset=+1] +ifdef::satellite[] include::modules/proc_completing-the-rhel7-image.adoc[leveloffset=+1] include::modules/proc_completing-the-rhel6-image.adoc[leveloffset=+1] +endif::[] include::modules/con_building_cloud_images_next_steps.adoc[leveloffset=+1] From 9c6a331e6051b55ba95da745ecb4aaab042314a6 Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 2 Jan 2025 14:51:06 +0100 Subject: [PATCH 2/3] Use dashes in favor of underscores in file names --- guides/common/assembly_building_cloud-images.adoc | 4 ++-- ...t_steps.adoc => con_building-cloud-images-next-steps.adoc} | 0 ...lding_cloud_images.adoc => con_building-cloud-images.adoc} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename guides/common/modules/{con_building_cloud_images_next_steps.adoc => con_building-cloud-images-next-steps.adoc} (100%) rename guides/common/modules/{con_building_cloud_images.adoc => con_building-cloud-images.adoc} (100%) diff --git a/guides/common/assembly_building_cloud-images.adoc b/guides/common/assembly_building_cloud-images.adoc index a638719189b..eb9f02489cb 100644 --- a/guides/common/assembly_building_cloud-images.adoc +++ b/guides/common/assembly_building_cloud-images.adoc @@ -1,4 +1,4 @@ -include::modules/con_building_cloud_images.adoc[] +include::modules/con_building-cloud-images.adoc[] include::modules/proc_creating-custom-rhel-images.adoc[leveloffset=+1] @@ -16,4 +16,4 @@ include::modules/proc_completing-the-rhel7-image.adoc[leveloffset=+1] include::modules/proc_completing-the-rhel6-image.adoc[leveloffset=+1] endif::[] -include::modules/con_building_cloud_images_next_steps.adoc[leveloffset=+1] +include::modules/con_building-cloud-images-next-steps.adoc[leveloffset=+1] diff --git a/guides/common/modules/con_building_cloud_images_next_steps.adoc b/guides/common/modules/con_building-cloud-images-next-steps.adoc similarity index 100% rename from guides/common/modules/con_building_cloud_images_next_steps.adoc rename to guides/common/modules/con_building-cloud-images-next-steps.adoc diff --git a/guides/common/modules/con_building_cloud_images.adoc b/guides/common/modules/con_building-cloud-images.adoc similarity index 100% rename from guides/common/modules/con_building_cloud_images.adoc rename to guides/common/modules/con_building-cloud-images.adoc From ae9941d5a384a006864ac1033513d90a2d5e716a Mon Sep 17 00:00:00 2001 From: Maximilian Kolb Date: Thu, 2 Jan 2025 14:52:00 +0100 Subject: [PATCH 3/3] Remove duplicate next steps --- guides/common/modules/proc_completing-the-rhel6-image.adoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/guides/common/modules/proc_completing-the-rhel6-image.adoc b/guides/common/modules/proc_completing-the-rhel6-image.adoc index 16006e87449..b0b725d0980 100644 --- a/guides/common/modules/proc_completing-the-rhel6-image.adoc +++ b/guides/common/modules/proc_completing-the-rhel6-image.adoc @@ -65,8 +65,3 @@ This creates a new `rhel6-cloud.qcow2` file in the location where you enter the ==== You must manually resize the partitions of instances based on the image in accordance with the disk space in the flavor that is applied to the instance. ==== - -== Next steps - -* Repeat the procedures for every image that you want to provision with {Project}. -* Move the image to the location where you want to store for future use.