From ee60a162758080e69dbe2e36ded48b1e1bfed073 Mon Sep 17 00:00:00 2001 From: Chris Perro Date: Thu, 27 May 2021 11:59:22 -0400 Subject: [PATCH 1/4] Add new definition info module for datahubs and update datahub_cluster.py to accommodate creating clusters by definition only Signed-off-by: Chris Perro --- plugins/modules/datahub_cluster.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/modules/datahub_cluster.py b/plugins/modules/datahub_cluster.py index d63c7f8f..98594e8e 100644 --- a/plugins/modules/datahub_cluster.py +++ b/plugins/modules/datahub_cluster.py @@ -195,6 +195,7 @@ name: datahub-name env: name-or-crn state: present + definition: definition-name subnet: subnet-id-for-cloud-provider image: image-uuid-from-catalog catalog: name-of-catalog-for-image From 7e73d68f737b4eddb000d19ca6ee41f7aee1667c Mon Sep 17 00:00:00 2001 From: Chris Perro Date: Tue, 15 Jun 2021 08:15:32 -0400 Subject: [PATCH 2/4] Updates for PR comments. Add authorship. Update some docs. etc. Signed-off-by: Chris Perro --- plugins/modules/datahub_cluster.py | 1 - plugins/modules/datahub_definition_info.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/datahub_cluster.py b/plugins/modules/datahub_cluster.py index 98594e8e..d63c7f8f 100644 --- a/plugins/modules/datahub_cluster.py +++ b/plugins/modules/datahub_cluster.py @@ -195,7 +195,6 @@ name: datahub-name env: name-or-crn state: present - definition: definition-name subnet: subnet-id-for-cloud-provider image: image-uuid-from-catalog catalog: name-of-catalog-for-image diff --git a/plugins/modules/datahub_definition_info.py b/plugins/modules/datahub_definition_info.py index 0394522c..7ed24058 100644 --- a/plugins/modules/datahub_definition_info.py +++ b/plugins/modules/datahub_definition_info.py @@ -32,6 +32,7 @@ - "Chris Perro (@cmperro)" - "Webster Mudge (@wmudge)" - "Dan Chaffelson (@chaffelson)" + - "Chris Perro (@cmperro)" requirements: - cdpy options: From a401ebf016af6be15885864a8c08f259301b3273 Mon Sep 17 00:00:00 2001 From: Chris Perro Date: Tue, 10 Aug 2021 13:41:35 -0400 Subject: [PATCH 3/4] Update env module to support passing in freeipa instance count Signed-off-by: Chris Perro --- plugins/modules/env.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/modules/env.py b/plugins/modules/env.py index 0bb9bab5..4ab858c8 100644 --- a/plugins/modules/env.py +++ b/plugins/modules/env.py @@ -842,7 +842,7 @@ def _configure_payload(self): payload['authentication'] = dict(publicKey=self.public_key_text) if self.freeipa is not None: - payload['freeIpa'] = dict(instanceCountByGroup=self.freeipa) + payload['freeIpa'] = dict(instanceCountByGroup=self.freeipa['instanceCountByGroup']) if self.vpc_id is not None: payload['vpcId'] = self.vpc_id @@ -875,6 +875,8 @@ def _configure_payload(self): ) payload['usePublicIp'] = self.public_ip payload['logStorage'] = dict(serviceAccountEmail=self.log_identity, storageLocationBase=self.log_location) + if self.freeipa is not None: + payload['freeIpa'] = dict(instanceCountByGroup=self.freeipa['instanceCountByGroup']) else: # For Azure payload['securityAccess'] = dict(defaultSecurityGroupId=self.default_sg, @@ -886,6 +888,8 @@ def _configure_payload(self): payload['existingNetworkParams'] = dict( networkId=self.vpc_id, resourceGroupName=self.resource_gp, subnetIds=self.subnet_ids ) + if self.freeipa is not None: + payload['freeIpa'] = dict(instanceCountByGroup=self.freeipa['instanceCountByGroup']) return payload @@ -928,7 +932,7 @@ def _reconcile_existing_state(self, existing): if self.description is not None and existing['description'] != self.description: mismatch.append(['description', existing['description']]) - if self.freeipa is not None and len(existing['freeipa']['serverIP']) != self.freeipa: + if self.freeipa is not None and len(existing['freeipa']['serverIP']) != self.freeipa['instanceCountByGroup']: mismatch.append(['freeipa', len(existing['freeipa']['serverIP'])]) if self.vpc_id is not None and existing['network']['aws']['vpcId'] != self.vpc_id: From 38e1155b97b601812167375d08e9a9489c9cf56c Mon Sep 17 00:00:00 2001 From: Chris Perro Date: Thu, 12 Aug 2021 12:44:31 -0400 Subject: [PATCH 4/4] List cmperro only once Signed-off-by: Chris Perro --- plugins/modules/datahub_definition_info.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/modules/datahub_definition_info.py b/plugins/modules/datahub_definition_info.py index 7ed24058..0394522c 100644 --- a/plugins/modules/datahub_definition_info.py +++ b/plugins/modules/datahub_definition_info.py @@ -32,7 +32,6 @@ - "Chris Perro (@cmperro)" - "Webster Mudge (@wmudge)" - "Dan Chaffelson (@chaffelson)" - - "Chris Perro (@cmperro)" requirements: - cdpy options: