From 7eb21080da96e3e7b35df9378d4a697f7796abd0 Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Fri, 27 Oct 2023 16:57:35 +0800 Subject: [PATCH 1/4] restore azure_rm_virtualmachine change{ --- plugins/modules/azure_rm_virtualmachine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index 7e50ddb25..d23f58b93 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -1482,7 +1482,7 @@ def exec_module(self, **kwargs): vm_dict['os_profile']['linux_configuration']['disable_password_authentication']: self.fail("(PropertyChangeNotAllowed) Changing property 'linuxConfiguration.disablePasswordAuthentication' is not allowed.") else: - self.linux_config = vm_dict['os_profile'].get('linux_configuration') + self.linux_config = vm_dict['os_profile'].get('linux_configuration') if isinstance(vm_dict['os_profile'], dict) else self.linux_config # Defaults for boot diagnostics if 'diagnostics_profile' not in vm_dict: From 17ce24cf167f22c60fcbc7fe60cc0a183072be11 Mon Sep 17 00:00:00 2001 From: Fred-sun <37327967+Fred-sun@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:08:10 +0800 Subject: [PATCH 2/4] Update azure_rm_virtualmachine.py --- plugins/modules/azure_rm_virtualmachine.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index d23f58b93..7ecfd9d6f 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -1481,8 +1481,6 @@ def exec_module(self, **kwargs): if self.linux_config['disable_password_authentication'] != \ vm_dict['os_profile']['linux_configuration']['disable_password_authentication']: self.fail("(PropertyChangeNotAllowed) Changing property 'linuxConfiguration.disablePasswordAuthentication' is not allowed.") - else: - self.linux_config = vm_dict['os_profile'].get('linux_configuration') if isinstance(vm_dict['os_profile'], dict) else self.linux_config # Defaults for boot diagnostics if 'diagnostics_profile' not in vm_dict: From e6020b5fab24c2fa24cc33140f2b71d6ce77d053 Mon Sep 17 00:00:00 2001 From: Fred-sun <37327967+Fred-sun@users.noreply.github.com> Date: Fri, 27 Oct 2023 22:28:40 +0800 Subject: [PATCH 3/4] Update azure_rm_virtualmachine.py --- plugins/modules/azure_rm_virtualmachine.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index 7ecfd9d6f..d23f58b93 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -1481,6 +1481,8 @@ def exec_module(self, **kwargs): if self.linux_config['disable_password_authentication'] != \ vm_dict['os_profile']['linux_configuration']['disable_password_authentication']: self.fail("(PropertyChangeNotAllowed) Changing property 'linuxConfiguration.disablePasswordAuthentication' is not allowed.") + else: + self.linux_config = vm_dict['os_profile'].get('linux_configuration') if isinstance(vm_dict['os_profile'], dict) else self.linux_config # Defaults for boot diagnostics if 'diagnostics_profile' not in vm_dict: From e11d6dc2e1deadf556247f51aa769beca424f9cf Mon Sep 17 00:00:00 2001 From: Fred-sun Date: Mon, 30 Oct 2023 14:51:27 +0800 Subject: [PATCH 4/4] Fix #1145 legacy error --- plugins/modules/azure_rm_virtualmachine.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/modules/azure_rm_virtualmachine.py b/plugins/modules/azure_rm_virtualmachine.py index d23f58b93..59470924d 100644 --- a/plugins/modules/azure_rm_virtualmachine.py +++ b/plugins/modules/azure_rm_virtualmachine.py @@ -903,7 +903,7 @@ "adminUsername": "chouseknecht", "computerName": "test10", "linuxConfiguration": { - "disablePasswordAuthentication": false + "disable_password_authentication": false }, "secrets": [] }, @@ -1481,8 +1481,6 @@ def exec_module(self, **kwargs): if self.linux_config['disable_password_authentication'] != \ vm_dict['os_profile']['linux_configuration']['disable_password_authentication']: self.fail("(PropertyChangeNotAllowed) Changing property 'linuxConfiguration.disablePasswordAuthentication' is not allowed.") - else: - self.linux_config = vm_dict['os_profile'].get('linux_configuration') if isinstance(vm_dict['os_profile'], dict) else self.linux_config # Defaults for boot diagnostics if 'diagnostics_profile' not in vm_dict: @@ -2021,7 +2019,7 @@ def exec_module(self, **kwargs): ) else: vm_resource.os_profile.linux_configuration = self.compute_models.LinuxConfiguration( - disable_password_authentication=linux_config.get('disablePasswordAuthentication', False) + disable_password_authentication=linux_config.get('disable_password_authentication', False) ) ssh_config = linux_config.get('ssh', None) if ssh_config: