From f2b0171b934958343e70a3bd7070bce574367854 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Tue, 3 Apr 2018 08:32:02 +1000 Subject: [PATCH] azure_rm_virtualmachine - backport of docs change around images supported (#37764) * Updated text for azure_rm_virtualmachine around images that can be used (#37686) (cherry picked from commit 04539ca448867997048bf68f9aa153cc4adb1b9e) * Added changelog fragment --- .../fragments/azure_rm_virtualmachine-docs-images.yaml | 2 ++ lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/azure_rm_virtualmachine-docs-images.yaml diff --git a/changelogs/fragments/azure_rm_virtualmachine-docs-images.yaml b/changelogs/fragments/azure_rm_virtualmachine-docs-images.yaml new file mode 100644 index 00000000000..23773636fe1 --- /dev/null +++ b/changelogs/fragments/azure_rm_virtualmachine-docs-images.yaml @@ -0,0 +1,2 @@ +bugfixes: +- azure_rm_virtualmachine - removed docs note that says on marketplace images can be used, custom images were added in 2.5 diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index c4fa68e21bf..4ba3e72a248 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -26,8 +26,9 @@ description: - Create, update, stop and start a virtual machine. Provide an existing storage account and network interface or allow the module to create these for you. If you choose not to provide a network interface, the resource group must contain a virtual network with at least one subnet. - - Currently requires an image found in the Azure Marketplace. Use azure_rm_virtualmachineimage_facts module - to discover the publisher, offer, sku and version of a particular image. + - Before Ansible 2.5, this required an image found in the Azure Marketplace which can be discovered with + M(azure_rm_virtualmachineimage_facts). In Ansible 2.5 and newer, custom images can be used as well, see the + examples for more details. options: resource_group: