Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow storage account type Premium_ZRS for FileStorage and BlockBlobStorage #482

Merged
merged 2 commits into from
Apr 12, 2021
Merged

Allow storage account type Premium_ZRS for FileStorage and BlockBlobStorage #482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d382c1
Allow storage account type Premium_ZRS for FileStorage and BlockBlobS…
francois-travais Apr 8, 2021
093bd27
Merge branch 'dev' into dev
haiyuazhang Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/modules/azure_rm_storageaccount.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
kind:
description:
- The kind of storage.
- The C(FileStorage) and (BlockBlobStorage) only used when I(account_type=Premium_LRS).
- The C(FileStorage) and (BlockBlobStorage) only used when I(account_type=Premium_LRS) or I(account_type=Premium_ZRS).
default: 'Storage'
choices:
- Storage
Expand Down Expand Up @@ -507,8 +507,8 @@ def exec_module(self, **kwargs):
self.fail("Parameter error: expecting custom_domain to have a use_sub_domain "
"attribute of type boolean.")

if self.kind in ['FileStorage', 'BlockBlobStorage', ] and self.account_type != 'Premium_LRS':
self.fail("Parameter error: Storage account with {0} kind require account type is Premium_LRS".format(self.kind))
if self.kind in ['FileStorage', 'BlockBlobStorage', ] and self.account_type not in ['Premium_LRS', 'Premium_ZRS']:
self.fail("Parameter error: Storage account with {0} kind require account type is Premium_LRS or Premium_ZRS".format(self.kind))
self.account_dict = self.get_account()

if self.state == 'present' and self.account_dict and \
Expand Down