Merge pull request #9419 from agrare/add_terraform_enterprise_catalog_support

Add terraform enterprise catalog support

Author: Fryguy

app/controllers/catalog_controller.rb

@@ -1009,7 +1009,7 @@ def atomic_req_submit
     end
 
     # for Ansible Tower items, check for Provider first
-    if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx'
+    if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' || @edit[:new][:st_prov_type] == 'generic_terraform_enterprise'
       if @edit[:new][:manager_id].blank?
         add_flash(_("Provider is required, please select one from the list"), :error)
       elsif @edit[:new][:template_id].blank?
@@ -1094,7 +1094,7 @@ def atomic_req_submit
            end
       common_st_record_vars(st)
       add_orchestration_template_vars(st) if st.kind_of?(ServiceTemplateOrchestration)
-      add_ansible_tower_job_template_vars(st) if st.kind_of?(ServiceTemplateAnsibleTower) || st.kind_of?(ServiceTemplateAwx)
+      add_configuration_script_vars(st) if st.kind_of?(ServiceTemplateAnsibleTower) || st.kind_of?(ServiceTemplateAwx) || st.kind_of?(ServiceTemplateTerraformEnterprise)
       add_server_profile_template_vars(st) if @edit[:new][:st_prov_type] == 'cisco_intersight'
       st.service_type = "atomic"
 
@@ -1304,7 +1304,7 @@ def set_form_vars
     @available_catalogs = available_catalogs.sort # Get available catalogs with tenants and ancestors
     @additional_tenants = @edit[:new][:tenant_ids].map(&:to_s) # Get ids of selected Additional Tenants in the Tenants tree
     available_orchestration_templates if @record.kind_of?(ServiceTemplateOrchestration)
-    available_automation_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx)
+    available_automation_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx) || @record.kind_of?(ServiceTemplateTerraformEnterprise)
     available_container_managers if @record.kind_of?(ServiceTemplateContainerTemplate)
     fetch_zones
     @edit[:new][:zone_id] = @record.zone_id
@@ -1529,7 +1529,7 @@ def get_form_vars
     end
 
     get_form_vars_orchestration if @edit[:new][:st_prov_type] == 'generic_orchestration'
-    fetch_form_vars_ansible_or_ct if %w[generic_ansible_tower generic_awx generic_container_template].include?(@edit[:new][:st_prov_type])
+    fetch_form_vars_ansible_or_ct if %w[generic_ansible_tower generic_awx generic_terraform_enterprise generic_container_template].include?(@edit[:new][:st_prov_type])
     fetch_form_vars_ovf_template if @edit[:new][:st_prov_type] == 'generic_ovf_template'
     fetch_form_vars_server_profile_templates if @edit[:new][:st_prov_type] == 'cisco_intersight'
   end
@@ -1591,7 +1591,7 @@ def fetch_form_vars_ansible_or_ct
         @edit[:new][:manager_id]          = nil
       else
         @edit[:new][:manager_id] = params[:manager_id]
-        available_job_templates(params[:manager_id]) if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx'
+        available_job_templates(params[:manager_id]) if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' || @edit[:new][:st_prov_type] == 'generic_terraform_enterprise'
         available_container_templates(params[:manager_id]) if @edit[:new][:st_prov_type] == 'generic_container_template'
       end
     end
@@ -1622,7 +1622,7 @@ def available_orchestration_templates
   end
 
   def available_container_templates(manager_id)
-    method = @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' ? 'configuration_scripts' : 'container_templates'
+    method = @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' || @edit[:new][:st_prov_type] == 'generic_terraform_enterprise' ? 'configuration_scripts' : 'container_templates'
     @edit[:new][:available_templates] =
       ExtManagementSystem.find_by(:id => manager_id).send(method).collect { |t| [t.name, t.id] }.sort
   end
@@ -1658,8 +1658,8 @@ def add_orchestration_template_vars(st)
     st.orchestration_manager  = @edit[:new][:manager_id].nil? ? nil : ExtManagementSystem.find(@edit[:new][:manager_id])
   end
 
-  def add_ansible_tower_job_template_vars(st)
-    st.job_template = @edit[:new][:template_id].nil? ? nil : ConfigurationScript.find(@edit[:new][:template_id])
+  def add_configuration_script_vars(st)
+    st.configuration_script = @edit[:new][:template_id].nil? ? nil : ConfigurationScript.find(@edit[:new][:template_id])
   end
 
   def add_server_profile_template_vars(service_template)

app/views/catalog/_form_basic_info.html.haml

@@ -138,7 +138,7 @@
                          :class               => "selectpicker")
             :javascript
               miqSelectPickerEvent('manager_id', '#{url}')
-    - elsif %w(generic_ansible_tower generic_awx generic_container_template).include?(@edit[:new][:st_prov_type])
+    - elsif %w(generic_ansible_tower generic_awx generic_terraform_enterprise generic_container_template).include?(@edit[:new][:st_prov_type])
       - opts = [["<#{_('Choose')}>", nil]] + @edit[:new][:available_managers]
       .form-group
         %label.col-md-2.control-label
@@ -155,7 +155,7 @@
           %label.col-md-2.control-label
             = @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx" ? _('Ansible Template') : _('Container Template')
           .col-md-10
-            - if @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx"
+            - if @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx" || @edit[:new][:st_prov_type] == "generic_terraform_enterprise"
               = select_tag('template_id',
                             grouped_options_for_select(@edit[:new][:available_templates], @edit[:new][:template_id]),
                             "data-miq_sparkle_on" => true,