11.0.4

CHANGELOG.md

@@ -1,10 +1,11 @@
-# Список изменений в версии 11.0.1
+# Список изменений в версии 11.0.4
 
 ## Добавлено
 
 ## Удалено
 
 ## Исправлено
+### Модуль decort_vm
 | Идентификатор<br>задачи | Описание |
 | --- | --- |
-| BANS-1173 | Модуль завершал работу ошибкой запроса к API при попытке добавить группу worker-узлов к существующему кластеру. |
+| BANS-1333 | Модуль завершал работу ошибкой при передаче параметров `disks` и `boot` для существующей ВМ. |

library/decort_k8s.py

@@ -215,7 +215,9 @@ class decort_k8s(DecortController):
                 self.k8s_workers_modify(
                     arg_k8swg=self.k8s_info,
                     arg_modwg=target_wgs,
-                    storage_policy_id=self.aparams['storage_policy_id'],
+                    master_node_storage_policy_id=(
+                        self.aparams['storage_policy_id']
+                    ),
                 )
                 self.k8s_info = self.k8s_get_by_id(k8s_id=self.k8s_id)
         return

library/decort_vm.py

@@ -1637,12 +1637,17 @@ class decort_vm(DecortController):
                         f'disk {aparam_boot_disk_id} is not attached to '
                         f'Compute ID {self.comp_id}.'
                     )
-            else:
+            elif aparam_boot_disk_id is not None:
+                aparam_disk_ids = []
+                if aparam_disks['objects']:
+                    aparam_disk_ids = [
+                        disk['id'] for disk in aparam_disks['objects']
+                    ]
                 match aparam_disks['mode']:
                     case 'update':
                         if (
                             aparam_boot_disk_id not in comp_disk_ids
-                            and aparam_boot_disk_id not in aparam_disks['ids']
+                            and aparam_boot_disk_id not in aparam_disk_ids
                         ):
                             check_errors = True
                             self.message(
@@ -1651,7 +1656,7 @@ class decort_vm(DecortController):
                                 f'to Compute ID {self.comp_id}.'
                             )
                     case 'match':
-                        if aparam_boot_disk_id not in aparam_disks['ids']:
+                        if aparam_boot_disk_id not in aparam_disk_ids:
                             check_errors = True
                             self.message(
                                 f'Check for parameter "boot.disk_id" failed: '
@@ -1659,7 +1664,7 @@ class decort_vm(DecortController):
                                 f'disks.ids'
                             )
                     case 'detach' | 'delete':
-                        if aparam_boot_disk_id in aparam_disks['ids']:
+                        if aparam_boot_disk_id in aparam_disk_ids:
                             check_errors = True
                             self.message(
                                 f'Check for parameter "boot.disk_id" failed: '

module_utils/decort_utils.py

@@ -43,7 +43,7 @@ class DecortController(object):
     _api: sdk_types.API | None = None
     _usermanager_whoami_result: None | dict = None
 
-    ANSIBLE_MODULES_VERSION = '11.0.1'
+    ANSIBLE_MODULES_VERSION = '11.0.4'
     COMPATIBLE_SDK_MINOR_VERSION = '1.4'
 
     VM_RESIZE_NOT = 0
@@ -5651,7 +5651,10 @@ class DecortController(object):
                     'workerDisk': wg_to_create['disk'],
                     'workerSepId': wg_to_create['sep_id'],
                     'workerSepPool': wg_to_create['pool'],
-                    'labels': wg_to_create['labels'],
+                    'labels': [
+                        label for label in (wg_to_create['labels'] or [])
+                        if 'workersGroupName' not in label
+                    ],
                     'taints': wg_to_create['taints'],
                     'annotations': wg_to_create['annotations'],
                     'userData': json.dumps(wg_to_create['ci_user_data']),