Skip to content

Commit 302e771

Browse files
Address asciidoctor-dita-vale issues for host registration (#4409)
* Split multiple modules into web UI and CLI * Minor fixes to address asciidoctor-dita-vale * Add abstract role and create basic abstracts --------- Co-authored-by: Maximilian Kolb <[email protected]>
1 parent 7ebf930 commit 302e771

File tree

48 files changed

+470
-357
lines changed

Some content is hidden

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

48 files changed

+470
-357
lines changed

guides/common/assembly_building-cloud-images.adoc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ include::modules/ref_supported-clients-in-registration.adoc[leveloffset=+1]
88

99
include::modules/proc_configuring-a-host-for-registration.adoc[leveloffset=+1]
1010

11-
include::modules/proc_registering-a-host.adoc[leveloffset=+1]
11+
include::modules/proc_registering-a-host-by-using-web-ui.adoc[leveloffset=+1]
1212

13-
include::modules/proc_registering-a-host-using-ansible.adoc[leveloffset=+1]
13+
include::modules/proc_registering-a-host-by-using-cli.adoc[leveloffset=+1]
14+
15+
include::modules/proc_registering-a-host-by-using-api.adoc[leveloffset=+1]
16+
17+
include::modules/proc_registering-a-host-by-using-ansible.adoc[leveloffset=+1]
1418

1519
include::modules/proc_installing-and-configuring-puppet-agent-manually.adoc[leveloffset=+1]
1620

guides/common/assembly_registering-hosts.adoc

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,43 @@ include::modules/ref_global-parameters-for-registration.adoc[leveloffset=+2]
1515

1616
include::modules/proc_configuring-a-host-for-registration.adoc[leveloffset=+2]
1717

18-
include::modules/proc_registering-a-host.adoc[leveloffset=+2]
18+
include::modules/proc_registering-a-host-by-using-web-ui.adoc[leveloffset=+2]
1919

20-
include::modules/proc_registering-a-host-using-ansible.adoc[leveloffset=+2]
20+
include::modules/proc_registering-a-host-by-using-cli.adoc[leveloffset=+2]
21+
22+
include::modules/proc_registering-a-host-by-using-api.adoc[leveloffset=+2]
23+
24+
include::modules/proc_registering-a-host-by-using-ansible.adoc[leveloffset=+2]
2125

2226
include::modules/proc_running-custom-code-during-host-registration.adoc[leveloffset=+2]
2327

2428
include::modules/proc_customizing-the-registration-templates.adoc[leveloffset=+2]
2529

2630
include::modules/con_invalidating-registration-tokens.adoc[leveloffset=+2]
2731

28-
include::modules/proc_invalidating-your-own-jwts.adoc[leveloffset=+3]
32+
include::modules/proc_invalidating-your-own-jwts-by-using-web-ui.adoc[leveloffset=+3]
33+
34+
include::modules/proc_invalidating-your-own-jwts-by-using-cli.adoc[leveloffset=+3]
35+
36+
include::modules/proc_invalidating-your-own-jwts-by-using-api.adoc[leveloffset=+3]
2937

30-
include::modules/proc_invalidating-jwts-of-other-users.adoc[leveloffset=+3]
38+
include::modules/proc_invalidating-jwts-of-other-users-by-using-web-ui.adoc[leveloffset=+3]
39+
40+
include::modules/proc_invalidating-jwts-of-other-users-by-using-cli.adoc[leveloffset=+3]
41+
42+
include::modules/proc_invalidating-jwts-of-other-users-by-using-api.adoc[leveloffset=+3]
3143

3244
include::modules/proc_invalidating-jwts-of-all-users.adoc[leveloffset=+3]
3345

3446
ifdef::satellite,orcharhino[]
3547
// Bootstrap script
3648
include::modules/proc_registering-hosts-by-using-the-bootstrap-script.adoc[leveloffset=+1]
3749

38-
include::modules/proc_setting-permissions-for-the-bootstrap-script.adoc[leveloffset=+2]
50+
include::modules/proc_creating-a-puppet-environment-for-bootstrap-registration.adoc[leveloffset=+1]
51+
52+
include::modules/proc_setting-permissions-for-the-bootstrap-script-by-using-web-ui.adoc[leveloffset=+2]
53+
54+
include::modules/proc_setting-permissions-for-the-bootstrap-script-by-using-cli.adoc[leveloffset=+2]
3955

4056
include::modules/ref_advanced-bootstrap-script-configuration.adoc[leveloffset=+2]
4157

guides/common/modules/con_invalidating-registration-tokens.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
[id="invalidating-registration-tokens"]
44
= Invalidating registration tokens
55

6+
[role="_abstract"]
67
When you generate a registration command in global host registration, {Project} also generates a unique JSON Web Token (JWT) that is used to authorize the registration call from a host to {ProjectServer}.
7-
This JWT is bound to the user that generated the registration command.
8+
If needed, you can invalidate a previously issued JWT.
9+
10+
A JWT is bound to the user that generated the registration command.
811

912
Users can configure a custom validity duration for the JWT.
1013
If the validity duration is too long or if the JWT has been compromised, the JWT poses a security concern.

guides/common/modules/con_registering-hosts-and-setting-up-host-integration.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[id="registering-hosts-and-setting-up-host-integration_{context}"]
44
= Registering hosts and setting up host integration
55

6+
[role="_abstract"]
67
You must register hosts that have not been provisioned through {Project} to be able to manage them with {Project}.
78
You can register hosts through {ProjectServer} or {SmartProxyServer}.
89

guides/common/modules/con_registering-hosts-by-using-global-registration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[id="Registering_Hosts_by_Using_Global_Registration_{context}"]
44
= Registering hosts by using global registration
55

6+
[role="_abstract"]
67
You can register a host to {Project} by generating a `curl` or `wget` command on {Project} and running this command on hosts.
78
This method uses two provisioning templates: *Global Registration* template and *Linux host_init_config default* template.
89
That gives you complete control over the host registration process.
@@ -17,7 +18,6 @@ For more information, see {AdministeringDocURL}limiting-host-resources[Limiting
1718
endif::[]
1819

1920
ifndef::satellite,orcharhino[]
20-
.Additional resources
21-
* You can extend registration options by plugins.
21+
You can extend registration options by plugins.
2222
For more information, see https://github.com/theforeman/foreman/blob/develop/developer_docs/how_to_create_a_plugin.asciidoc[How to Create a Plugin] and https://github.com/theforeman/foreman/blob/develop/developer_docs/slot-and-fill.asciidoc[Slot and Fill].
2323
endif::[]

guides/common/modules/con_using-custom-ssl-certificate-for-hosts.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
[id="using-custom-ssl-certificate-for-hosts_{context}"]
44
= Using {customssl} certificate for hosts
55

6+
[role="_abstract"]
67
You can use {customssl} certificate on your hosts to enable encrypted communications between {ProjectServer}, {SmartProxyServer}, and hosts.
78
Before deploying it to your hosts, ensure that you have configured the {customssl} certificate to your {ProjectServer}.

guides/common/modules/proc_changing-the-method-the-bootstrap-script-uses-to-download-the-consumer-rpm.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[id="Changing_the_Method_the_Bootstrap_Script_Uses_to_Download_the_Consumer_RPM_{context}"]
44
= Changing the method the bootstrap script uses to download the consumer RPM
55

6+
[role="_abstract"]
67
By default, the bootstrap script uses HTTP to download the consumer RPM from `\http://{foreman-example-com}/pub/katello-ca-consumer-latest.noarch.rpm`.
78
In some environments, you might want to allow HTTPS only between the host and {Project}.
89
Use `--download-method` to change the download method from HTTP to HTTPS.

guides/common/modules/proc_configuring-a-host-for-registration.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[id="Configuring_a_Host_for_Registration_{context}"]
44
= Configuring a host for registration
55

6+
[role="_abstract"]
67
Configure your host for registration to {ProjectServer} or {SmartProxyServer}.
78
You can use a configuration management tool to configure multiple hosts at once.
89

guides/common/modules/proc_creating-a-domain-for-a-host-during-registration.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[id="Creating_a_Domain_for_a_Host_During_Registration_{context}"]
44
= Creating a domain for a host during registration
55

6+
[role="_abstract"]
67
To create a host record, the DNS domain of a host needs to exist in {Project} prior to running the script.
78
If the domain does not exist, add it using `--add-domain`.
89

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
:_mod-docs-content-type: PROCEDURE
2+
3+
[id="creating-a-puppet-environment-for-bootstrap-registration"]
4+
= Creating a Puppet environment for bootstrap registration
5+
6+
[role="_abstract"]
7+
If a host group is associated with a Puppet environment created inside a `Production` environment, Puppet fails to retrieve the Puppet CA certificate while registering a host from that host group.
8+
You must create a suitable Puppet environment to be associated with a host group.
9+
10+
.Procedure
11+
. Manually create a directory:
12+
+
13+
[options="nowrap", subs="+quotes,attributes"]
14+
----
15+
# mkdir /etc/puppetlabs/code/environments/_example_environment_
16+
----
17+
. In the {ProjectWebUI}, navigate to *Configure* > *Puppet ENC* > *Environments*.
18+
. Click *Import environment from*.
19+
. Select your {SmartProxy}.
20+
. Choose the created directory and click *Update*.

0 commit comments

Comments
 (0)