Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion guides/common/modules/con_configuring-salt.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Configuring_Salt_{context}"]
[id="configuring-salt"]
= Configuring Salt

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_introduction-to-salt.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Introduction_to_Salt_{context}"]
[id="introduction-to-salt"]
= Introduction to Salt

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_salt-architecture.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Salt_Architecture_{context}"]
[id="salt-architecture"]
= Salt architecture

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_salt-variables.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Salt_Variables_{context}"]
[id="salt-variables"]
= Salt variables

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_setting-up-salt-minions.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Setting_Up_Salt_Minions_{context}"]
[id="setting-up-salt-minions"]
= Setting up Salt Minions

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/con_using-salt.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: CONCEPT

[id="Using_Salt_{context}"]
[id="using-salt"]
= Using Salt

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_activating-salt.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Activating_Salt_{context}"]
[id="activating-salt"]
= Activating Salt

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Authenticating_Salt_Minions_Using_Host_Names_{context}"]
[id="authenticating-salt-minions-using-host-names"]
= Authenticating Salt Minions using host names

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Authenticating_Salt_Minions_Using_Salt_Autosign_Grains_{context}"]
[id="authenticating-salt-minions-using-salt-autosign-grains"]
= Authenticating Salt Minions using Salt autosign Grains

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Configuring_Salt_on_{project-context}_Server_{context}"]
[id="configuring-salt-on-{project-context}-server"]
= Configuring Salt on {ProjectServer}

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_configuring-the-salt-api.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Configuring_the_Salt_API_{context}"]
[id="configuring-the-salt-api"]
= Configuring the Salt API

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Creating_a_Host_Group_with_Salt_{context}"]
[id="creating-a-host-group-with-salt"]
= Creating a host group with Salt

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Deploying_Salt_Minion_Hosts_{context}"]
[id="deploying-salt-minion-hosts"]
= Deploying Salt Minion hosts

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Enabling_Salt_Grain_Uploads_{context}"]
[id="enabling-salt-grain-uploads"]
= Enabling Salt Grain uploads

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Enabling_Salt_Report_Uploads_{context}"]
[id="enabling-salt-report-uploads"]
= Enabling Salt report uploads

[role="_abstract"]
Expand Down
6 changes: 4 additions & 2 deletions guides/common/modules/proc_importing-salt-states.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Importing_Salt_States_{context}"]
[id="importing-salt-states"]
= Importing Salt States

[role="_abstract"]
Expand All @@ -17,6 +17,8 @@ This only removes the Salt State from {Project}, not from the disk of your Salt
. Click *Submit* to import the Salt States.
. Optional: After you have imported Salt States, you can assign them to hosts or Host Groups.
Salt applies these Salt States to any hosts they are assigned to every time you run `state.highstate`.
For more information, see xref:Running_Salt_{context}[].
. Optional: Configure the paths for Salt States and Salt Pillars in `/etc/salt/master`.
By default, Salt States are located in `/srv/salt` and and Salt Pillars in `/srv/pillar`.

.Additional resources
* xref:running-salt[]
2 changes: 1 addition & 1 deletion guides/common/modules/proc_installing-the-salt-plugin.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Installing_the_Salt_plugin_{context}"]
[id="installing-the-salt-plugin"]
= Installing the Salt plugin

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_running-salt.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Running_Salt_{context}"]
[id="running-salt"]
= Running Salt

[role="_abstract"]
Expand Down
11 changes: 6 additions & 5 deletions guides/common/modules/proc_salt-example.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Salt_Example_{context}"]
[id="salt-example"]
= Salt example

[role="_abstract"]
Expand Down Expand Up @@ -37,7 +37,6 @@ Welcome to {{ grains['fqdn'] }} Powered by {{ salt['pillar.get']('vendor_name')
+
Access the `fqdn` Salt Grain from within this template and retrieve the `vendor_name` parameter from the Salt Pillar.
. Import the `motd` Salt State into {Project}.
For more information, see xref:Importing_Salt_States_{context}[].
. On your Salt Master, verify that Salt has been given access to the `vendor_name` parameter:
+
[options="nowrap" subs="attributes"]
Expand All @@ -52,9 +51,11 @@ If the output does not include the value of the `vendor_name` parameter, you mus
----
# salt '*' saltutil.refresh_pillar
----
+
For information about how to refresh Salt Pillar data, see xref:Viewing_ENC_Parameters_{context}[].
. Add the `motd` Salt State to your Salt Minions or a host group.
. Run `state.highstate` to apply the Salt State.
For more information, see xref:Running_Salt_{context}[].
. Optional: Verify the contents of `/etc/motd` on a Salt Minion.

.Additional resources
* xref:importing-salt-states[]
* xref:viewing-enc-parameters[]
* xref:running-salt[]
2 changes: 1 addition & 1 deletion guides/common/modules/proc_using-the-salt-api.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Using_the_Salt_API_{context}"]
[id="using-the-salt-api"]
= Using the Salt API

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Verifying_the_Connection_between_Salt_Master_and_Salt_Minions_{context}"]
[id="verifying-the-connection-between-salt-master-and-salt-minions"]
= Verifying the connection between Salt Master and Salt Minions

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_viewing-enc-parameters.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Viewing_ENC_Parameters_{context}"]
[id="viewing-enc-parameters"]
= Viewing ENC parameters

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_viewing-salt-autosign-keys.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Viewing_Salt_Autosign_Keys_{context}"]
[id="viewing-salt-autosign-keys"]
= Viewing Salt autosign keys

[role="_abstract"]
Expand Down
2 changes: 1 addition & 1 deletion guides/common/modules/proc_viewing-salt-reports.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: PROCEDURE

[id="Viewing_Salt_Reports_{context}"]
[id="viewing-salt-reports"]
= Viewing Salt reports

[role="_abstract"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:_mod-docs-content-type: REFERENCE

[id="Using_the_Salt_Hammer_CLI_{context}"]
[id="using-the-salt-cli"]
= Using the Salt Hammer CLI

[role="_abstract"]
Expand Down
4 changes: 2 additions & 2 deletions guides/doc-Managing_Configurations_Salt/master.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ include::common/modules/proc_installing-the-salt-plugin.adoc[leveloffset=+1]

include::common/modules/con_configuring-salt.adoc[leveloffset=+1]

include::common/modules/proc_configuring-salt-on-project.adoc[leveloffset=+2]
include::common/modules/proc_configuring-salt-on-project-server.adoc[leveloffset=+2]

include::common/modules/proc_configuring-salt-on-hosts.adoc[leveloffset=+2]

Expand Down Expand Up @@ -56,7 +56,7 @@ include::common/modules/proc_using-older-salt-minions.adoc[leveloffset=+2]

include::common/modules/con_using-salt.adoc[leveloffset=+1]

include::common/modules/ref_using-the-salt-hammer-cli.adoc[leveloffset=+2]
include::common/modules/ref_using-the-salt-cli.adoc[leveloffset=+2]

include::common/modules/proc_using-the-salt-api.adoc[leveloffset=+2]

Expand Down
Loading