diff --git a/guides/common/modules/con_configuring-salt.adoc b/guides/common/modules/con_configuring-salt.adoc index b3ef7934674..6583b83514e 100644 --- a/guides/common/modules/con_configuring-salt.adoc +++ b/guides/common/modules/con_configuring-salt.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT -[id="Configuring_Salt_{context}"] +[id="configuring-salt"] = Configuring Salt [role="_abstract"] diff --git a/guides/common/modules/con_introduction-to-salt.adoc b/guides/common/modules/con_introduction-to-salt.adoc index 50eacbcb3b2..9451c91463a 100644 --- a/guides/common/modules/con_introduction-to-salt.adoc +++ b/guides/common/modules/con_introduction-to-salt.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT -[id="Introduction_to_Salt_{context}"] +[id="introduction-to-salt"] = Introduction to Salt [role="_abstract"] diff --git a/guides/common/modules/con_salt-architecture.adoc b/guides/common/modules/con_salt-architecture.adoc index 282d11b0e31..d7cd2e3b7d8 100644 --- a/guides/common/modules/con_salt-architecture.adoc +++ b/guides/common/modules/con_salt-architecture.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT -[id="Salt_Architecture_{context}"] +[id="salt-architecture"] = Salt architecture [role="_abstract"] diff --git a/guides/common/modules/con_salt-variables.adoc b/guides/common/modules/con_salt-variables.adoc index 5986386fa42..2cb010697d2 100644 --- a/guides/common/modules/con_salt-variables.adoc +++ b/guides/common/modules/con_salt-variables.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT -[id="Salt_Variables_{context}"] +[id="salt-variables"] = Salt variables [role="_abstract"] diff --git a/guides/common/modules/con_setting-up-salt-minions.adoc b/guides/common/modules/con_setting-up-salt-minions.adoc index 81208826220..9c17379cd6b 100644 --- a/guides/common/modules/con_setting-up-salt-minions.adoc +++ b/guides/common/modules/con_setting-up-salt-minions.adoc @@ -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"] diff --git a/guides/common/modules/con_using-salt.adoc b/guides/common/modules/con_using-salt.adoc index 54fb50f0f55..91323c3f6c7 100644 --- a/guides/common/modules/con_using-salt.adoc +++ b/guides/common/modules/con_using-salt.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: CONCEPT -[id="Using_Salt_{context}"] +[id="using-salt"] = Using Salt [role="_abstract"] diff --git a/guides/common/modules/proc_activating-salt.adoc b/guides/common/modules/proc_activating-salt.adoc index 2e9666af459..081f6dd8bd5 100644 --- a/guides/common/modules/proc_activating-salt.adoc +++ b/guides/common/modules/proc_activating-salt.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Activating_Salt_{context}"] +[id="activating-salt"] = Activating Salt [role="_abstract"] diff --git a/guides/common/modules/proc_authenticating-salt-minions-using-host-names.adoc b/guides/common/modules/proc_authenticating-salt-minions-using-host-names.adoc index bd616576420..4f356b73352 100644 --- a/guides/common/modules/proc_authenticating-salt-minions-using-host-names.adoc +++ b/guides/common/modules/proc_authenticating-salt-minions-using-host-names.adoc @@ -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"] diff --git a/guides/common/modules/proc_authenticating-salt-minions-using-salt-autosign-grains.adoc b/guides/common/modules/proc_authenticating-salt-minions-using-salt-autosign-grains.adoc index 11157e9643a..e36c1182ebb 100644 --- a/guides/common/modules/proc_authenticating-salt-minions-using-salt-autosign-grains.adoc +++ b/guides/common/modules/proc_authenticating-salt-minions-using-salt-autosign-grains.adoc @@ -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"] diff --git a/guides/common/modules/proc_configuring-salt-on-project.adoc b/guides/common/modules/proc_configuring-salt-on-project-server.adoc similarity index 97% rename from guides/common/modules/proc_configuring-salt-on-project.adoc rename to guides/common/modules/proc_configuring-salt-on-project-server.adoc index 86284f1bfbb..7bfb6c0e929 100644 --- a/guides/common/modules/proc_configuring-salt-on-project.adoc +++ b/guides/common/modules/proc_configuring-salt-on-project-server.adoc @@ -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"] diff --git a/guides/common/modules/proc_configuring-the-salt-api.adoc b/guides/common/modules/proc_configuring-the-salt-api.adoc index a842a05b5b1..61138332ac8 100644 --- a/guides/common/modules/proc_configuring-the-salt-api.adoc +++ b/guides/common/modules/proc_configuring-the-salt-api.adoc @@ -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"] diff --git a/guides/common/modules/proc_creating-a-host-group-with-salt.adoc b/guides/common/modules/proc_creating-a-host-group-with-salt.adoc index ec3fbbebd1e..aa7b5d89371 100644 --- a/guides/common/modules/proc_creating-a-host-group-with-salt.adoc +++ b/guides/common/modules/proc_creating-a-host-group-with-salt.adoc @@ -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"] diff --git a/guides/common/modules/proc_deploying-salt-minion-hosts.adoc b/guides/common/modules/proc_deploying-salt-minion-hosts.adoc index 72b87f5f174..468386953e3 100644 --- a/guides/common/modules/proc_deploying-salt-minion-hosts.adoc +++ b/guides/common/modules/proc_deploying-salt-minion-hosts.adoc @@ -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"] diff --git a/guides/common/modules/proc_enabling-salt-grain-uploads.adoc b/guides/common/modules/proc_enabling-salt-grain-uploads.adoc index 76fbfbcc53d..9920bb4332a 100644 --- a/guides/common/modules/proc_enabling-salt-grain-uploads.adoc +++ b/guides/common/modules/proc_enabling-salt-grain-uploads.adoc @@ -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"] diff --git a/guides/common/modules/proc_enabling-salt-report-uploads.adoc b/guides/common/modules/proc_enabling-salt-report-uploads.adoc index 148d139f252..5e4d57dde0f 100644 --- a/guides/common/modules/proc_enabling-salt-report-uploads.adoc +++ b/guides/common/modules/proc_enabling-salt-report-uploads.adoc @@ -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"] diff --git a/guides/common/modules/proc_importing-salt-states.adoc b/guides/common/modules/proc_importing-salt-states.adoc index d8dffeafff8..2e102c71961 100644 --- a/guides/common/modules/proc_importing-salt-states.adoc +++ b/guides/common/modules/proc_importing-salt-states.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Importing_Salt_States_{context}"] +[id="importing-salt-states"] = Importing Salt States [role="_abstract"] @@ -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[] diff --git a/guides/common/modules/proc_installing-the-salt-plugin.adoc b/guides/common/modules/proc_installing-the-salt-plugin.adoc index 7bcb1d36e01..5fd973959b6 100644 --- a/guides/common/modules/proc_installing-the-salt-plugin.adoc +++ b/guides/common/modules/proc_installing-the-salt-plugin.adoc @@ -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"] diff --git a/guides/common/modules/proc_running-salt.adoc b/guides/common/modules/proc_running-salt.adoc index 89d8c07299d..4107d1a39a4 100644 --- a/guides/common/modules/proc_running-salt.adoc +++ b/guides/common/modules/proc_running-salt.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Running_Salt_{context}"] +[id="running-salt"] = Running Salt [role="_abstract"] diff --git a/guides/common/modules/proc_salt-example.adoc b/guides/common/modules/proc_salt-example.adoc index d06518b170c..e48794164ef 100644 --- a/guides/common/modules/proc_salt-example.adoc +++ b/guides/common/modules/proc_salt-example.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Salt_Example_{context}"] +[id="salt-example"] = Salt example [role="_abstract"] @@ -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"] @@ -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[] diff --git a/guides/common/modules/proc_using-the-salt-api.adoc b/guides/common/modules/proc_using-the-salt-api.adoc index 9a46b6641d0..dcbeca0ede7 100644 --- a/guides/common/modules/proc_using-the-salt-api.adoc +++ b/guides/common/modules/proc_using-the-salt-api.adoc @@ -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"] diff --git a/guides/common/modules/proc_verifying-the-connection-between-salt-master-and-salt-minions.adoc b/guides/common/modules/proc_verifying-the-connection-between-salt-master-and-salt-minions.adoc index e1195f937ac..93882d41282 100644 --- a/guides/common/modules/proc_verifying-the-connection-between-salt-master-and-salt-minions.adoc +++ b/guides/common/modules/proc_verifying-the-connection-between-salt-master-and-salt-minions.adoc @@ -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"] diff --git a/guides/common/modules/proc_viewing-enc-parameters.adoc b/guides/common/modules/proc_viewing-enc-parameters.adoc index 74845cbe23f..1a4a1621848 100644 --- a/guides/common/modules/proc_viewing-enc-parameters.adoc +++ b/guides/common/modules/proc_viewing-enc-parameters.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Viewing_ENC_Parameters_{context}"] +[id="viewing-enc-parameters"] = Viewing ENC parameters [role="_abstract"] diff --git a/guides/common/modules/proc_viewing-salt-autosign-keys.adoc b/guides/common/modules/proc_viewing-salt-autosign-keys.adoc index e2b822a45df..9a644e446c4 100644 --- a/guides/common/modules/proc_viewing-salt-autosign-keys.adoc +++ b/guides/common/modules/proc_viewing-salt-autosign-keys.adoc @@ -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"] diff --git a/guides/common/modules/proc_viewing-salt-reports.adoc b/guides/common/modules/proc_viewing-salt-reports.adoc index 35c51d10e1a..fe1c17dfe22 100644 --- a/guides/common/modules/proc_viewing-salt-reports.adoc +++ b/guides/common/modules/proc_viewing-salt-reports.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: PROCEDURE -[id="Viewing_Salt_Reports_{context}"] +[id="viewing-salt-reports"] = Viewing Salt reports [role="_abstract"] diff --git a/guides/common/modules/ref_using-the-salt-hammer-cli.adoc b/guides/common/modules/ref_using-the-salt-cli.adoc similarity index 94% rename from guides/common/modules/ref_using-the-salt-hammer-cli.adoc rename to guides/common/modules/ref_using-the-salt-cli.adoc index 6c6dfc23a32..26b7f767037 100644 --- a/guides/common/modules/ref_using-the-salt-hammer-cli.adoc +++ b/guides/common/modules/ref_using-the-salt-cli.adoc @@ -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"] diff --git a/guides/doc-Managing_Configurations_Salt/master.adoc b/guides/doc-Managing_Configurations_Salt/master.adoc index d060eccd86c..26e5eafcf27 100644 --- a/guides/doc-Managing_Configurations_Salt/master.adoc +++ b/guides/doc-Managing_Configurations_Salt/master.adoc @@ -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] @@ -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]