diff options
| author | Zim Kalinowski <zikalino@microsoft.com> | 2019-02-18 14:04:01 +0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-02-18 10:17:15 -0800 |
| commit | ef54e0410cd547f0d5d6ed1a6621f7dcfc7c709e (patch) | |
| tree | ae6141cad3dc20f29780d84026833602143fdd23 | |
| parent | 22709af2e99b555515ec00bd5c76dcbdda847614 (diff) | |
| download | ansible-ef54e0410cd547f0d5d6ed1a6621f7dcfc7c709e.tar.gz | |
fixed merge conflicts
| -rw-r--r-- | changelogs/fragments/52388-postgresqldatabase-fix-force-update.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/fragments/52388-postgresqldatabase-fix-force-update.yml b/changelogs/fragments/52388-postgresqldatabase-fix-force-update.yml new file mode 100644 index 0000000000..50e82408df --- /dev/null +++ b/changelogs/fragments/52388-postgresqldatabase-fix-force-update.yml @@ -0,0 +1,2 @@ +bugfixes: + - azure_rm_postgresqldatabase - fix force_update bug (https://github.com/ansible/ansible/issues/50978). diff --git a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py index 305a8fb723..f758e99b7e 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_postgresqldatabase.py @@ -146,6 +146,7 @@ class AzureRMDatabases(AzureRMModuleBase): self.resource_group = None self.server_name = None self.name = None + self.force_update = None self.parameters = dict() self.results = dict(changed=False) @@ -200,6 +201,7 @@ class AzureRMDatabases(AzureRMModuleBase): if not self.check_mode: self.delete_postgresqldatabase() else: + self.fail("Database properties cannot be updated without setting 'force_update' option") self.to_do = Actions.NoAction if (self.to_do == Actions.Create) or (self.to_do == Actions.Update): |