Merge pull request #9584 from shanemcd/explicit-is_container_group

Explicit db field for is_container_group

Reviewed-by: Jake McDermott <yo@jakemcdermott.me>
Reviewed-by: Ryan Petrello <None>

awx_collection/plugins/modules/tower_instance_group.py

@@ -37,6 +37,11 @@ options:
         - Credential to authenticate with Kubernetes or OpenShift.  Must be of type "Kubernetes/OpenShift API Bearer Token".
       required: False
       type: str
+    is_container_group:
+      description:
+        - Signifies that this InstanceGroup should act as a ContainerGroup. If no credential is specified, the underlying Pod's ServiceAccount will be used.
+      required: False
+      type: bool
     policy_instance_percentage:
       description:
         - Minimum percentage of all instances that will be automatically assigned to this group when new instances come online.
@@ -85,6 +90,7 @@ def main():
         name=dict(required=True),
         new_name=dict(),
         credential=dict(),
+        is_container_group=dict(type='bool', default=False),
         policy_instance_percentage=dict(type='int', default='0'),
         policy_instance_minimum=dict(type='int', default='0'),
         policy_instance_list=dict(type='list'),
@@ -100,6 +106,7 @@ def main():
     name = module.params.get('name')
     new_name = module.params.get("new_name")
     credential = module.params.get('credential')
+    is_container_group = module.params.get('is_container_group')
     policy_instance_percentage = module.params.get('policy_instance_percentage')
     policy_instance_minimum = module.params.get('policy_instance_minimum')
     policy_instance_list = module.params.get('policy_instance_list')
@@ -129,6 +136,8 @@ def main():
     new_fields['name'] = new_name if new_name else (module.get_item_name(existing_item) if existing_item else name)
     if credential is not None:
         new_fields['credential'] = credential_id
+    if is_container_group is not None:
+        new_fields['is_container_group'] = is_container_group
     if policy_instance_percentage is not None:
         new_fields['policy_instance_percentage'] = policy_instance_percentage
     if policy_instance_minimum is not None:

awx_collection/test/awx/test_instance_group.py

@@ -50,6 +50,7 @@ def test_container_group_create(run_module, admin_user, kube_credential):
     result = run_module('tower_instance_group', {
         'name': 'foo-c-group',
         'credential': kube_credential.id,
+        'is_container_group': True,
         'state': 'present'
     }, admin_user)
     assert not result.get('failed', False), result['msg']
@@ -61,6 +62,7 @@ def test_container_group_create(run_module, admin_user, kube_credential):
     result = run_module('tower_instance_group', {
         'name': 'foo-c-group',
         'credential': kube_credential.id,
+        'is_container_group': True,
         'pod_spec_override': pod_spec,
         'state': 'present'
     }, admin_user)