Skip to content

Commit cfe820e

Browse files
Add snippet content type (theforeman#4626)
* Add snippet content type * Add separate repo snippet for each build * Move procedure heading from snippet to module * Move verification from snippet to module * Update module type * Add + signs * Drop a snippet that is only used once * Drop dlist headings that did not work with the snippet attr * Add + to prevent an attr from showing * Drop symlink in favor of a regular include --------- Co-authored-by: Maximilian Kolb <mail@maximilian-kolb.de>
1 parent 4f24328 commit cfe820e

96 files changed

Lines changed: 237 additions & 65 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

guides/common/assembly_installing-capsule-server.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ifdef::satellite[]
2222
include::modules/proc_configuring-repositories-proxy.adoc[leveloffset=+1]
2323
endif::[]
2424
ifndef::satellite[]
25-
include::modules/con_configuring-repositories.adoc[leveloffset=+1]
25+
include::modules/proc_configuring-repositories.adoc[leveloffset=+1]
2626
endif::[]
2727

2828
// Installing {SmartProxyServer} Packages

guides/common/assembly_installing-server-connected.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ifdef::satellite[]
1010
include::modules/proc_registering-to-red-hat-subscription-management.adoc[leveloffset=+1]
1111
endif::[]
1212

13-
include::modules/con_configuring-repositories.adoc[leveloffset=+1]
13+
include::modules/proc_configuring-repositories.adoc[leveloffset=+1]
1414

1515
include::modules/con_considerations-for-using-the-foreman-installer-utility.adoc[leveloffset=+1]
1616

guides/common/assembly_preparing-smartproxyservers-for-load-balancing.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ifdef::satellite[]
2020
include::modules/proc_configuring-repositories-proxy.adoc[leveloffset=+1]
2121
endif::[]
2222
ifndef::satellite[]
23-
include::modules/con_configuring-repositories.adoc[leveloffset=+1]
23+
include::modules/proc_configuring-repositories.adoc[leveloffset=+1]
2424
endif::[]
2525

2626
// Installing {SmartProxyServer} Packages

guides/common/modules/con_configuring-repositories.adoc

Lines changed: 0 additions & 9 deletions
This file was deleted.

guides/common/modules/con_prerequisites-for-network-boot-provisioning.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The provisioned machine must appear on the same network as your provisioning inf
2121
+
2222
You can integrate a compute resource with {Project} and let the compute resource create virtual machines through this integration.
2323
You can also provision virtual machines from unintegrated infrastructure as you would bare-metal machines.
24+
+
2425
include::snip_prerequisites-common-compute-resource.adoc[]
2526

2627
[role="_additional-resources"]

guides/common/modules/con_prerequisites-for-vmware-provisioning.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ ifndef::orcharhino[]
1818
For more information, see xref:preparing-networking[].
1919
endif::[]
2020
* An existing VMware template if you want to use image-based provisioning.
21+
+
2122
include::snip_prerequisites-common-compute-resource.adoc[]

guides/common/modules/con_provisioning-cloud-instances-on-google-compute-engine.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ endif::[]
1313
Before you can provision cloud instances on Google Compute Engine, ensure that your environment meets the following requirements:
1414

1515
include::snip_prerequisite-networking-for-provisioning.adoc[]
16+
+
1617
include::snip_prerequisites-common-compute-resource.adoc[]
1718
* In your GCE project, configure a service account with the necessary IAM Compute role.
1819
For more information, see https://cloud.google.com/compute/docs/access/iam[Compute Engine IAM roles] in the GCE documentation.

guides/common/modules/proc_configuring-a-finish-template-for-amazon-ec2.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ EOS
4141
. In the {ProjectWebUI}, navigate to *Hosts* > *Operating systems* and select the operating system that you want for your host.
4242
. Click the *Templates* tab, and from the *Finish Template* list, select your finish template.
4343
. In the {ProjectWebUI}, navigate to *Hosts* > *Create Host*.
44+
+
4445
include::snip_steps-create-a-host-tab-host.adoc[]
4546
. Click the *Parameters* tab and navigate to *Host parameters*.
4647
ifdef::katello,satellite,orcharhino[]

guides/common/modules/proc_configuring-a-host-to-use-the-pull-client.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This does not use SSH and hosts do not require opening up any incoming firewall
1111
* You have registered the host to {Project}.
1212
* The {SmartProxy} through which the host is registered is configured to use `pull-mqtt` mode.
1313
For more information, see {InstallingSmartProxyDocURL}configuring-pull-based-transport-for-remote-execution_{smart-proxy-context}[Configuring pull-based transport for remote execution] in _{InstallingSmartProxyDocTitle}_.
14+
+
1415
include::snip_prerequisite-project-client-repository-enabled.adoc[]
1516
ifdef::satellite[]
1617
* The AppStream repository for the operating system version of the host is synchronized on {ProjectServer}, available in the content view and the lifecycle environment of the host, and enabled for the host.

guides/common/modules/proc_configuring-ipxe-environment.adoc

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,17 @@ ifndef::foreman-deb[]
5757
# restorecon -RvF /var/lib/tftpboot/
5858
----
5959
endif::[]
60-
include::snip_step-set-bootstrap-http-url.adoc[]
60+
. Set the HTTP URL.
61+
* If you want to use {ProjectServer} for booting, reconfigure your {ProjectServer}:
62+
+
63+
[options="nowrap" subs="+quotes,attributes"]
64+
----
65+
# {foreman-installer} \
66+
--foreman-proxy-dhcp-ipxefilename "http://_{foreman-example-com}_/unattended/iPXE?bootstrap=1"
67+
----
68+
* If you want to use {SmartProxyServer} for booting, reconfigure your {SmartProxyServer}:
69+
+
70+
[options="nowrap" subs="+quotes,attributes"]
71+
----
72+
# {foreman-installer} --foreman-proxy-dhcp-ipxe-bootstrap true
73+
----

0 commit comments

Comments
 (0)