Merge pull request #120 from gyptazy/fix/119-maintenance-mode-cli-and…

…-config Fix maintenance mode when using cli arg and config mode by using the merged list.
gyptazy · Nov 9, 2024 · 222beb3 · 222beb3
2 parents 28f87e2 + f9b30d0
commit 222beb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.changelogs/1.0.6/119_fix_maintenance_mode_cli_and_config.yml b/.changelogs/1.0.6/119_fix_maintenance_mode_cli_and_config.yml
@@ -0,0 +1,2 @@
+fixed:
+  - Fix maintenance mode when using cli arg and config mode by using the merged list (by @CartCaved). [#119]
diff --git a/proxlb b/proxlb
@@ -880,7 +880,7 @@ def balancing_vm_maintenance(proxlb_config, app_args, node_statistics, vm_statis
         maintenance_nodes_list = maintenance_nodes_list + app_args.maintenance.split(',')
 
     # Ensure that only existing nodes in the cluster will be used.
-    if len(proxlb_config['vm_maintenance_nodes']) > 1:
+    if len(maintenance_nodes_list) > 1:
         maintenance_nodes_list = set(maintenance_nodes_list) & set(nodes_present)
         logging.info(f'{info_prefix} Maintenance mode for the following hosts defined: {maintenance_nodes_list}')
     else:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		fixed:
		- Fix maintenance mode when using cli arg and config mode by using the merged list (by @CartCaved). [#119]