From 80357cf9b0af8996f366b8ca1724f273e1ca34ae Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Mon, 22 Sep 2025 14:32:42 +0100 Subject: [PATCH 1/2] Add vc tier parameter to de_virtual_cluster module Signed-off-by: Jim Enright Co-Authored-By: Philippe Lanckvrind --- plugins/modules/de_virtual_cluster.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/plugins/modules/de_virtual_cluster.py b/plugins/modules/de_virtual_cluster.py index 6cb1926..41127a3 100644 --- a/plugins/modules/de_virtual_cluster.py +++ b/plugins/modules/de_virtual_cluster.py @@ -61,6 +61,16 @@ - Comma-separated Workload usernames of CDP users to be granted access to the Virtual Cluster. type: str required: False + vc_tier: + description: + - Tier of the virtual cluster, for CDE 1.19.0 and beyond. + - C(CORE) enables operational batch jobs. + - C(ALLP) enables both operational batch jobs and interactive sessions. + type: str + required: False + choices: + - ALLP + - CORE chart_value_overrides: description: - Chart overrides for creating a virtual cluster. @@ -114,6 +124,7 @@ name: virtual-cluster-name cluster_name: cde-service-name env: cdp-environment-name + vc_tier: ALLP state: present wait: true delay: 30 @@ -259,6 +270,7 @@ def __init__(self, module): self.runtime_spot_component = self._get_param("runtime_spot_component") self.spark_version = self._get_param("spark_version") self.acl_users = self._get_param("acl_users") + self.vc_tier = self._get_param("vc_tier") self.state = self._get_param("state") self.force = self._get_param("force") @@ -385,6 +397,7 @@ def _create_vc(self): runtime_spot_component=self.runtime_spot_component, spark_version=self.spark_version, acl_users=self.acl_users, + vc_tier=self.vc_tier, ) return_desc = None if result and result["vcId"]: @@ -444,6 +457,7 @@ def main(): runtime_spot_component=dict(required=False, type="str", default=None), spark_version=dict(required=False, type="str", default=None), acl_users=dict(required=False, type="str", default=None), + vc_tier=dict(required=False, type='str', choices=['ALLP', 'CORE'], default=None), state=dict( required=False, type="str", From da3c053599188e374d7e4defb107b5993d670fc3 Mon Sep 17 00:00:00 2001 From: Jim Enright Date: Mon, 22 Sep 2025 15:05:58 +0100 Subject: [PATCH 2/2] Change VC tier parameter Signed-off-by: Jim Enright --- plugins/modules/de_virtual_cluster.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/plugins/modules/de_virtual_cluster.py b/plugins/modules/de_virtual_cluster.py index 41127a3..dee3574 100644 --- a/plugins/modules/de_virtual_cluster.py +++ b/plugins/modules/de_virtual_cluster.py @@ -61,7 +61,7 @@ - Comma-separated Workload usernames of CDP users to be granted access to the Virtual Cluster. type: str required: False - vc_tier: + tier: description: - Tier of the virtual cluster, for CDE 1.19.0 and beyond. - C(CORE) enables operational batch jobs. @@ -71,6 +71,8 @@ choices: - ALLP - CORE + aliases: + - vc_tier chart_value_overrides: description: - Chart overrides for creating a virtual cluster. @@ -124,7 +126,7 @@ name: virtual-cluster-name cluster_name: cde-service-name env: cdp-environment-name - vc_tier: ALLP + tier: ALLP state: present wait: true delay: 30 @@ -270,7 +272,7 @@ def __init__(self, module): self.runtime_spot_component = self._get_param("runtime_spot_component") self.spark_version = self._get_param("spark_version") self.acl_users = self._get_param("acl_users") - self.vc_tier = self._get_param("vc_tier") + self.tier = self._get_param("tier") self.state = self._get_param("state") self.force = self._get_param("force") @@ -397,7 +399,7 @@ def _create_vc(self): runtime_spot_component=self.runtime_spot_component, spark_version=self.spark_version, acl_users=self.acl_users, - vc_tier=self.vc_tier, + vc_tier=self.tier, ) return_desc = None if result and result["vcId"]: @@ -457,7 +459,13 @@ def main(): runtime_spot_component=dict(required=False, type="str", default=None), spark_version=dict(required=False, type="str", default=None), acl_users=dict(required=False, type="str", default=None), - vc_tier=dict(required=False, type='str', choices=['ALLP', 'CORE'], default=None), + tier=dict( + required=False, + type="str", + choices=["ALLP", "CORE"], + default=None, + aliases=["vc_tier"], + ), state=dict( required=False, type="str",