azure_rm_virtualmachine: Add 'accept_terms' for accepting terms when deploying paid marketplace images (#44701)

azure_rm_storageaccount: Add 'StandardSSD_LRS', and choices to correct unrelated sanity error
This commit is contained in:
Jasper Aorangi 2018-08-30 12:14:44 +12:00 committed by Matt Davis
parent 5bdcaff921
commit 2541a8c494
6 changed files with 140 additions and 9 deletions

View file

@ -149,6 +149,7 @@ try:
from azure.mgmt.dns import DnsManagementClient
from azure.mgmt.web import WebSiteManagementClient
from azure.mgmt.containerservice import ContainerServiceClient
from azure.mgmt.marketplaceordering import MarketplaceOrderingAgreements
from azure.storage.cloudstorageaccount import CloudStorageAccount
from adal.authentication_context import AuthenticationContext
from azure.mgmt.rdbms.postgresql import PostgreSQLManagementClient
@ -275,6 +276,7 @@ class AzureRMModuleBase(object):
self._compute_client = None
self._dns_client = None
self._web_client = None
self._marketplace_client = None
self._containerservice_client = None
self._mysql_client = None
self._postgresql_client = None
@ -1099,3 +1101,11 @@ class AzureRMModuleBase(object):
api_version='2018-06-01')
return self._containerinstance_client
@property
def marketplace_client(self):
self.log('Getting marketplace agreement client')
if not self._marketplace_client:
self._marketplace_client = self.get_mgmt_svc_client(MarketplaceOrderingAgreements,
base_url=self._cloud_environment.endpoints.resource_manager)
return self._marketplace_client