Revert "Update support for Datahub Definitions"

This reverts commit 3a366e0.

Author: wmudge

roles/runtime/tasks/initialize_base.yml

@@ -94,34 +94,23 @@
       ansible.builtin.set_fact:
         run__datahub_available_templates: "{{ __datahub_template_info.templates | selectattr('productVersion', 'search', run__cdp_datalake_version) | map(attribute='clusterTemplateName') | list }}"
 
-    - name: Retrieve available CDP Datahub definitions
-      cloudera.cloud.datahub_definition_info:
-      register: __datahub_definition_info
-
-    - name: Set fact for available CDP Datahub definitions by Datalake version
-      ansible.builtin.set_fact:
-        run__datahub_available_definitions: "{{ __datahub_definition_info.definitions | selectattr('productVersion', 'search', run__cdp_datalake_version) | map(attribute='clusterDefinitionName') | list }}"
-
     - name: Construct CDP Datahub configurations
       ansible.builtin.set_fact:
         run__datahub_configs: "{{ run__datahub_configs | default([]) | union([config]) }}"
       vars:
         include: "{{ lookup('template', __datahub_config.include | default('experiences_config_placeholder.j2')) | from_yaml }}"
-        overlay: "{{ __datahub_config.instance_groups | default(include.instance_groups | default([]) ) }}"
+        overlay: "{{ __datahub_config.instance_groups | default(include.instance_groups) | mandatory }}"
         base: "{{ run__datahub_instance_group_base }}"
         config:
           name: "{{ __datahub_config.name | default([run__namespace, __datahub_config.suffix | default(include.suffix) | default(run__datahub_suffix)] | join('-')) }}"
-          template: "{{ __datahub_config.template | default(include.template | default(omit) ) }}"
-          definition: "{{ __datahub_config.definition | default(include.definition | default(omit) ) }}"
-          instance_groups: "{{ (overlay | length > 0) | ternary(overlay | map('cloudera.exe.combine_onto', base, recursive=True) | list, omit) }}"
+          template: "{{ __datahub_config.template | default(include.template) | mandatory }}"
+          instance_groups: "{{ overlay | map('cloudera.exe.combine_onto', base, recursive=True) | list }}"
           tags: "{{ __datahub_config.tags | default(run__datahub_tags) }}"
       loop: "{{ run__datahub_definitions }}"
       loop_control:
         loop_var: __datahub_config
         label: "{{ config.name }}"
-      failed_when:
-        - "'template' in __datahub_config or 'template' in include"
-        - run__datahub_available_templates | select('search', config.template) | list | length < 1
+      failed_when: run__datahub_available_templates | select('search', config.template) | list | length < 1
 
     - name: Check CDP Datahub names
       ansible.builtin.assert:

roles/runtime/tasks/setup_base.yml

@@ -23,9 +23,8 @@
     subnet: "{{ run__datahub_subnet_ids | first }}"
     image: "{{ run__datahub_image_catalog_entry.uuid }}"
     catalog: "{{ run__datahub_image_catalog_name }}"
-    template: "{{ ('template' in __datahub_config_item) | ternary(run__datahub_available_templates | select('ansible.builtin.search', __datahub_config_item.template | default(omit)) | list | first, omit, omit) }}"
-    definition: "{{ ('definition' in __datahub_config_item) |  ternary(run__datahub_available_definitions | select('ansible.builtin.search', __datahub_config_item.definition | default(omit)) | list | first, omit, omit) }}"
-    groups: "{{ __datahub_config_item.instance_groups | default(omit) }}"
+    template: "{{ run__datahub_available_templates | select('ansible.builtin.search', __datahub_config_item.template) | list | first }}"
+    groups: "{{ __datahub_config_item.instance_groups }}"
     tags: "{{ __datahub_config_item.tags }}"
     wait: yes
   loop_control: