From 22608939eb918504faf25850f71d568756256847 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 3 Apr 2015 14:23:04 -0400 Subject: [PATCH] Update intro_windows.rst Refer to PowerShell consistently. --- docsite/rst/intro_windows.rst | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docsite/rst/intro_windows.rst b/docsite/rst/intro_windows.rst index b5e6be82340..544c6fba754 100644 --- a/docsite/rst/intro_windows.rst +++ b/docsite/rst/intro_windows.rst @@ -11,7 +11,7 @@ Windows: How Does It Work As you may have already read, Ansible manages Linux/Unix machines using SSH by default. Starting in version 1.7, Ansible also contains support for managing Windows machines. This uses -native powershell remoting, rather than SSH. +native PowerShell remoting, rather than SSH. Ansible will still be run from a Linux control machine, and uses the "winrm" Python module to talk to remote hosts. @@ -67,7 +67,7 @@ communication channel that leverages Windows remoting:: ansible windows [-i inventory] -m win_ping --ask-vault-pass If you haven't done anything to prep your systems yet, this won't work yet. This is covered in a later -section about how to enable powershell remoting - and if necessary - how to upgrade powershell to +section about how to enable PowerShell remoting - and if necessary - how to upgrade PowerShell to a version that is 3 or higher. You'll run this command again later though, to make sure everything is working. @@ -77,21 +77,21 @@ You'll run this command again later though, to make sure everything is working. Windows System Prep ``````````````````` -In order for Ansible to manage your windows machines, you will have to enable Powershell remoting configured. +In order for Ansible to manage your windows machines, you will have to enable PowerShell remoting configured. -To automate setup of WinRM, you can run `this powershell script `_ on the remote machine. +To automate setup of WinRM, you can run `this PowerShell script `_ on the remote machine. Admins may wish to modify this setup slightly, for instance to increase the timeframe of the certificate. .. _getting_to_powershell_three_or_higher: -Getting to Powershell 3.0 or higher +Getting to PowerShell 3.0 or higher ``````````````````````````````````` -Powershell 3.0 or higher is needed for most provided Ansible modules for Windows, and is also required to run the above setup script. +PowerShell 3.0 or higher is needed for most provided Ansible modules for Windows, and is also required to run the above setup script. -Looking at an ansible checkout, copy the `examples/scripts/upgrade_to_ps3.ps1 `_ script onto the remote host and run a powershell console as an administrator. You will now be running Powershell 3 and can try connectivity again using the win_ping technique referenced above. +Looking at an ansible checkout, copy the `examples/scripts/upgrade_to_ps3.ps1 `_ script onto the remote host and run a PowerShell console as an administrator. You will now be running PowerShell 3 and can try connectivity again using the win_ping technique referenced above. .. _what_windows_modules_are_available: @@ -105,7 +105,7 @@ Browse this index to see what is available. In many cases, it may not be necessary to even write or use an Ansible module. -In particular, the "script" module can be used to run arbitrary powershell scripts, allowing Windows administrators familiar with powershell a very native way to do things, as in the following playbook:: +In particular, the "script" module can be used to run arbitrary PowerShell scripts, allowing Windows administrators familiar with PowerShell a very native way to do things, as in the following playbook:: - hosts: windows tasks: @@ -121,10 +121,10 @@ Developers: Supported modules and how it works Developing ansible modules are covered in a `later section of the documentation `_, with a focus on Linux/Unix. What if you want to write Windows modules for ansible though? -For Windows, ansible modules are implemented in Powershell. Skim those Linux/Unix module development chapters before proceeding. +For Windows, ansible modules are implemented in PowerShell. Skim those Linux/Unix module development chapters before proceeding. Windows modules live in a "windows/" subfolder in the Ansible "library/" subtree. For example, if a module is named -"library/windows/win_ping", there will be embedded documentation in the "win_ping" file, and the actual powershell code will live in a "win_ping.ps1" file. Take a look at the sources and this will make more sense. +"library/windows/win_ping", there will be embedded documentation in the "win_ping" file, and the actual PowerShell code will live in a "win_ping.ps1" file. Take a look at the sources and this will make more sense. Modules (ps1 files) should start as follows:: @@ -169,7 +169,7 @@ Windows Playbook Examples Look to the list of windows modules for most of what is possible, though also some modules like "raw" and "script" also work on Windows, as do "fetch" and "slurp". -Here is an example of pushing and running a powershell script:: +Here is an example of pushing and running a PowerShell script:: - name: test script module hosts: windows @@ -223,7 +223,7 @@ form of new modules, tweaks to existing modules, documentation, or something els :doc:`playbooks` Learning ansible's configuration management language `List of Windows Modules `_ - Windows specific module list, all implemented in powershell + Windows specific module list, all implemented in PowerShell `Mailing List `_ Questions? Help? Ideas? Stop by the list on Google Groups `irc.freenode.net `_