Skip to content

Commit 38e49e7

Browse files
Fix issues reported by asciidoctor-dita-vale (Managing Configurations Puppet) (#4189)
* Convert xrefs * Drop discrete headings * Resolve errors in additional resources Some are not relevant and can be dropped, others need to be updated. * Resolve errors around free floating paras Procedures can't contain free paragraphs. * Move alternative Puppet install note to intro --------- Co-authored-by: Maximilian Kolb <[email protected]>
1 parent 368411f commit 38e49e7

12 files changed

+33
-41
lines changed

guides/common/modules/con_how-puppet-integrates-with-project.adoc

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,10 @@ The Puppet agent evaluates the system state on the host.
1919
If the Puppet agent finds differences, known as _drifts_, between the _desired state_ defined in the _catalog_ and the actual state, it enforces correction of the state of the host.
2020
The Puppet agent then reports correction results back to the Puppet server, which reports them to {Project}.
2121

22-
.Puppet modules
23-
The _desired state_ of a host is defined in a _catalog_.
24-
The _catalog_ is compiled from Puppet manifests of one or more Puppet modules assigned to the host.
25-
A Puppet module is a collection of classes, manifests, resources, files, and templates.
26-
The Puppet modules work as components of host configuration definitions.
27-
28-
.Smart Class parameters
29-
You can override parameters of a Puppet module by using Smart Class parameters if the module supports the use of parameters.
30-
You can define the parameters in your {Project} as _key-value_ pairs, which behave similar to host parameters or Ansible variables.
31-
32-
.Puppet environments
33-
You can also create multiple Puppet environments to control versions of configuration definitions or to manage variants of the definitions, and to test the definitions before you deploy them on production.
34-
35-
.High-level integration steps
3622
Puppet integration with {Project} involves the following high-level steps:
3723

3824
ifdef::katello,orcharhino,satellite[]
39-
. xref:Enabling_Puppet_Integration_{context}[Enable Puppet integration].
25+
. xref:common/modules/proc_enabling-puppet.adoc#Enabling_Puppet_Integration_{context}[Enable Puppet integration].
4026
endif::[]
4127
ifdef::katello,satellite,orcharhino[]
4228
. Import Puppet agent packages into {Project}.
@@ -49,13 +35,17 @@ by syncing repositories in custom products
4935
endif::[]
5036
and by using {ContentManagementDocURL}Managing_Activation_Keys_content-management[activation keys] and {ContentManagementDocURL}Managing_Content_Views_content-management[content views].
5137
endif::[]
52-
. Install Puppet agent on hosts during xref:Installing_and_Configuring_Puppet_Agent_during_Host_Provisioning_{context}[provisioning], xref:installing-and-configuring-puppet-agent-during-host-registration_{context}[registration], xref:Installing_and_Configuring_Puppet_Agent_Manually_{context}[manually], or by remote job execution.
38+
. Install Puppet agent on hosts during xref:common/modules/proc_installing-and-configuring-puppet-agent-manually.adoc#Installing_and_Configuring_Puppet_Agent_during_Host_Provisioning_{context}[provisioning], xref:common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc#installing-and-configuring-puppet-agent-during-host-registration_{context}[registration], xref:common/modules/proc_installing-and-configuring-puppet-agent-manually.adoc#Installing_and_Configuring_Puppet_Agent_Manually_{context}[manually], or by remote job execution.
5339

54-
.Additional resources
55-
ifdef::katello,satellite,orcharhino[]
56-
* {ContentManagementDocURL}[{ContentManagementDocTitle}]
57-
endif::[]
58-
* {ManagingHostsDocURL}registering-hosts-and-setting-up-host-integration_managing-hosts[Registering hosts and setting up host integration] in _{ManagingHostsDocTitle}_
59-
* {ManagingHostsDocURL}Configuring_and_Setting_Up_Remote_Jobs_managing-hosts[Configuring and setting up remote jobs] in _{ManagingHostsDocTitle}_
40+
Puppet modules::
41+
The _desired state_ of a host is defined in a _catalog_.
42+
The _catalog_ is compiled from Puppet manifests of one or more Puppet modules assigned to the host.
43+
A Puppet module is a collection of classes, manifests, resources, files, and templates.
44+
The Puppet modules work as components of host configuration definitions.
6045

61-
The following procedures outline how to use a Puppet module to install, configure, and manage the _ntp_ service to provide examples.
46+
Smart Class parameters::
47+
You can override parameters of a Puppet module by using Smart Class parameters if the module supports the use of parameters.
48+
You can define the parameters in your {Project} as _key-value_ pairs, which behave similar to host parameters or Ansible variables.
49+
50+
Puppet environments::
51+
You can also create multiple Puppet environments to control versions of configuration definitions or to manage variants of the definitions, and to test the definitions before you deploy them on production.

guides/common/modules/con_introducing-configuration-management-by-using-puppet.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ At the same time, it decreases your configuration effort as Puppet makes it easy
1111

1212
.Additional resources
1313
* https://puppet.com/docs/puppet/[Open Source Puppet documentation]
14-
* https://forge.puppet.com/[Puppet Forge] -- a repository of pre-built Puppet modules
14+
* https://forge.puppet.com/[Puppet Forge]

guides/common/modules/proc_assigning-a-puppet-class-to-an-individual-host.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ server 1.de.pool.ntp.org
6767
server 2.de.pool.ntp.org
6868
server 3.de.pool.ntp.org
6969
----
70-
70+
+
7171
You now have a working ntp module which you can add to a host or group of hosts to roll out your ntp configuration automatically.

guides/common/modules/proc_creating-a-custom-puppet-environment.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@ You can create a Puppet environment within your {Project}.
1212
. Optional: Set a location context.
1313
. Optional: Set an organization context.
1414
. Click *Submit* to create the Puppet environment.
15-
16-
Note that before you run an import of Puppet modules into {Project}, the environment must already exist as the folder `/etc/puppetlabs/code/environments/_example_environment_` on the Puppet server and contain installed Puppet modules.

guides/common/modules/proc_importing-puppet-classes-and-environments.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Import Puppet classes and environments from the installed Puppet modules to {Pro
77

88
.Prerequisites
99
* Ensure to select *Any Organization* and *Any Location* as context, otherwise the import might fail.
10+
* Before you run an import of Puppet modules into {Project}, the environment must already exist as the folder `/etc/puppetlabs/code/environments/_example_environment_` on the Puppet server and contain installed Puppet modules.
1011

1112
.Procedure
1213
. In the {ProjectWebUI}, navigate to *Configure* > *Puppet ENC* > *Classes* or *Configure* > *Puppet ENC* > *Environments*.

guides/common/modules/proc_installing-a-puppet-module.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ You can install a pre-built Puppet module from the Puppet Forge.
77
The Puppet Forge is a repository that provides Puppet modules contributed by the community.
88
Puppet modules flagged as _supported_ are officially supported and tested by Puppet Inc.
99

10+
[NOTE]
11+
====
12+
An alternative way to install a Puppet module is to copy a folder containing the Puppet module to the module path as mentioned below.
13+
Ensure to resolve its dependencies manually.
14+
====
15+
1016
This example shows how to add the _ntp module_ to hosts.
1117

1218
.Procedure
@@ -33,6 +39,3 @@ Notice: Installing -- do not interrupt ...
3339
|-| puppetlabs-ntp (v8.3.0)
3440
|-- puppetlabs-stdlib (v4.25.1) [/etc/puppetlabs/code/environments/production/modules]
3541
----
36-
37-
An alternative way to install a Puppet module is to copy a folder containing the Puppet module to the module path as mentioned above.
38-
Ensure to resolve its dependencies manually.

guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-provisioning.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A configured Puppet agent is required on the host for Puppet integration with yo
88

99
.Prerequisites
1010
* Puppet must be enabled in your {Project}.
11-
For more information, see xref:Enabling_Puppet_Integration_{context}[].
11+
For more information, see xref:common/modules/proc_enabling-puppet.adoc#Enabling_Puppet_Integration_{context}[].
1212
ifdef::satellite[]
1313
include::snip_prerequisite-project-client-repository-ak.adoc[]
1414
* You have an activation key.

guides/common/modules/proc_installing-and-configuring-puppet-agent-during-host-registration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif::[]
1212
.Prerequisites
1313
* Puppet must be enabled in your {Project}.
1414
ifdef::managing-configurations-puppet[]
15-
For more information, see xref:Enabling_Puppet_Integration_{context}[].
15+
For more information, see xref:common/modules/proc_enabling-puppet.adoc#Enabling_Puppet_Integration_{context}[].
1616
endif::[]
1717
ifndef::managing-configurations-puppet[]
1818
For more information, see {ManagingConfigurationsPuppetDocURL}Enabling_Puppet_Integration_managing-configurations-puppet[Enabling Puppet Integration with {Project}] in _{ManagingConfigurationsPuppetDocTitle}_.
@@ -71,7 +71,7 @@ ifndef::katello,orcharhino,satellite[]
7171
. Navigate to *Hosts* > *Register Host* and register your host.
7272
endif::[]
7373
ifeval::[{context} == "managing-hosts"]
74-
For more information, see xref:Registering_Hosts_by_Using_Global_Registration_{context}[].
74+
For more information, see xref:common/modules/proc_registering-hosts-by-using-global-registration.adoc#Registering_Hosts_by_Using_Global_Registration_{context}[].
7575
endif::[]
7676
ifeval::[{context} != "managing-hosts"]
7777
For more information, see {ManagingHostsDocURL}Registering_Hosts_by_Using_Global_Registration_managing-hosts[Registering hosts by using global registration] in _{ManagingHostsDocTitle}_.

guides/common/modules/proc_installing-and-configuring-puppet-agent-manually.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif::[]
1212
.Prerequisites
1313
* Puppet must be enabled in your {Project}.
1414
ifdef::managing-configurations-puppet[]
15-
For more information, see xref:Enabling_Puppet_Integration_{context}[].
15+
For more information, see xref:common/modules/proc_enabling-puppet.adoc#Enabling_Puppet_Integration_{context}[].
1616
endif::[]
1717
ifndef::managing-configurations-puppet[]
1818
For more information, see {ManagingConfigurationsPuppetDocURL}Enabling_Puppet_Integration_managing-configurations-puppet[Enabling Puppet Integration with {Project}] in _{ManagingConfigurationsPuppetDocTitle}_.

guides/common/modules/proc_running-puppet-once-using-ssh.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
Assign the proper job template to the _Run Puppet Once_ feature to run Puppet on hosts.
77

88
.Procedure
9-
. In the {ProjectWebUI}, navigate to *Administer* > *Remote Execution Features*.
10-
. Select the `puppet_run_host` remote execution feature.
11-
. Assign the `Run Puppet Once {endash} SSH Default` job template.
12-
13-
Run Puppet on hosts by running a job and selecting category `Puppet` and template `Run Puppet Once - SSH Default`.
9+
. Edit remote execution settings on {Project}:
10+
.. In the {ProjectWebUI}, navigate to *Administer* > *Remote Execution Features*.
11+
.. Select the `puppet_run_host` remote execution feature.
12+
.. Assign the `Run Puppet Once {endash} SSH Default` job template.
13+
. To run Puppet on hosts, execute a remote job and select category `Puppet` and template `Run Puppet Once - SSH Default`.
1414
Alternatively, click *Run Puppet Once* in the *Schedule Remote Job* drop down menu on the host details page.

0 commit comments

Comments
 (0)