Skip to content

Commit 4e9df08

Browse files
committed
Fixing tasks 170689, 1707369
1 parent 2870b59 commit 4e9df08

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

articles/automation/python-packages.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ Once a package has been imported, it's listed on the Python 2 packages page in y
2626

2727
## Import packages with dependencies
2828

29-
Azure automation doesn't resolve dependencies for python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
29+
Azure automation doesn't resolve dependencies for Python packages during the import process. There are two ways to import a package with all its dependencies. Only one of the following steps needs to be used to import the packages into your Automation account.
3030

3131
### Manually download
3232

33-
On a Windows 64-bit machine with [python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
33+
On a Windows 64-bit machine with [Python2.7](https://www.python.org/downloads/release/latest/python2) and [pip](https://pip.pypa.io/en/stable/) installed, run the following command to download a package and all its dependencies:
3434

3535
```cmd
3636
C:\Python27\Scripts\pip2.7.exe download -d <output dir> <package name>
@@ -40,7 +40,7 @@ Once the packages are downloaded, you can import them into your automation accou
4040

4141
### Runbook
4242

43-
Import the python runbook [Import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
43+
To obtain a runbook, [import Python 2 packages from pypi into Azure Automation account](https://gallery.technet.microsoft.com/scriptcenter/Import-Python-2-packages-57f7d509) from the gallery into your Automation account. Make sure the Run Settings are set to **Azure** and start the runbook with the parameters. The runbook requires a Run As account for the Automation account to work. For each parameter make sure you start it with the switch as seen in the following list and image:
4444

4545
* -s \<subscriptionId\>
4646
* -g \<resourceGroup\>
@@ -79,7 +79,7 @@ for group in groups:
7979

8080
## Develop and test runbooks offline
8181

82-
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
82+
To develop and test your Python 2 runbooks offline, you can use the [Azure Automation Python emulated assets](https://github.com/azureautomation/python_emulated_assets) module on GitHub. This module allows you to reference your shared resources such as credentials, variables, connections, and certificates.
8383

8484
## Next steps
8585

articles/automation/shared-resources/modules.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ Azure Automation allows you to import PowerShell modules to enable cmdlets in ru
1616

1717
* [Azure PowerShell Az.Automation](/powershell/azure/new-azureps-module-az?view=azps-1.1.0)
1818
* [Azure PowerShell AzureRM.Automation](https://docs.microsoft.com/powershell/module/azurerm.automation/?view=azurermps-6.13.0)
19-
* Internal `Orchestrator.AssetManagement.Cmdlets` module for the Log Analytics agent for Windows
2019
* Other PowerShell modules
20+
* Internal `Orchestrator.AssetManagement.Cmdlets` module
21+
* Python 2 modules
2122
* Custom modules that you create
2223

2324
When you create an Automation account, Azure Automation imports some modules by default. See [Default modules](#default-modules).
@@ -91,9 +92,13 @@ Note that the internal cmdlets differ in naming from the Az and AzureRM cmdlets.
9192

9293
We recommend that you use Az or AzureRM cmdlets for manipulating Azure Automation resources outside the context of a runbook.
9394

94-
## Module supporting Get-AutomationPSCredential
95+
## Orchestrator.AssetManagement.Cmdlets module
9596

96-
The `Get-AutomationPSCredential` cmdlet is part of the module `Orchestrator.AssetManagement.Cmdlets`. This cmdlet returns a `PSCredential` object, which is expected by most PowerShell cmdlets that work with credentials. To find out more about the use of credentials in Azure Automation, see [Credential assets in Azure Automation](credentials.md).
97+
Azure Automation supports the internal `Orchestrator.AssetManagement.Cmdlets` module for the Log Analytics agent for Windows, installed by default. The `Get-AutomationPSCredential` cmdlet in this module is commonly used in runbooks to retrieve a `PSCredential` object, which is expected by most PowerShell cmdlets that work with credentials. To find out more about the use of credentials in Azure Automation, see [Credential assets in Azure Automation](credentials.md).
98+
99+
## Python modules
100+
101+
You can create Python 2 runbooks in Azure Automation. For Python module information, see [Manage Python 2 packages in Azure Automation](../python-packages.md).
97102

98103
## Migrating to Az modules
99104

@@ -112,7 +117,7 @@ Importing an Az module into your Automation account doesn't automatically import
112117
* When a runbook invokes a cmdlet from a module
113118
* When a runbook imports the module explicitly with the [Import-Module](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/import-module?view=powershell-7) cmdlet
114119
* When a runbook imports another dependent module
115-
120+
116121
#### Testing for your runbooks and DSC configurations prior to module migration
117122

118123
Be sure to test all runbooks and DSC configurations carefully in a separate Automation account before migrating to the Az modules.

0 commit comments

Comments
 (0)