Merge pull request #9194 from GilbertCherrie/add_terraform_catalog

Add terraform template catalog

Author: agrare

app/controllers/catalog_controller.rb

@@ -95,15 +95,15 @@ def catalog_tab_content(key_name, &block)
 
   def catalog_basic_information(record, sb_params, tenants_tree)
     prov_types = catalog_provision_types
-    prov_data = [prov_types[:template], prov_types[:ovf]].include?(record.prov_type) && catalog_provision?(record, :playbook) ? provisioning : nil
+    prov_data = [prov_types[:template], prov_types[:ovf]].include?(record.prov_type) && (catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)) ? provisioning : nil
     data = {:title => _('Basic Information'), :mode => "miq_catalog_basic_information"}
     rows = []
     rows.push(row_data(_('Name'), record.name))
     rows.push(row_data(_('Description'), record.description))
     rows.push(row_data(_('Display in Catalog'), {:input => "checkbox", :name => "display", :checked => record.display, :disabled => true, :label => ''}))
     rows.push(row_data(_('Catalog'), record.service_template_catalog ? record.service_template_catalog.name : _('Unassigned')))
     rows.push(row_data(_('Zone'), record.zone ? record.zone.name : '')) unless record.composite?
-    rows.push(row_data(_('Dialog'), sb_params[:dialog_label])) unless catalog_provision?(record, :playbook)
+    rows.push(row_data(_('Dialog'), sb_params[:dialog_label])) unless catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)
     rows.push(row_data(_("Price / Month (in %{currency})") % {:currency => record.currency.code}, record.price)) if record.currency
     rows.push(row_data(_('Item Type'), _(ServiceTemplate.all_catalog_item_types[record.prov_type]))) if record.prov_type
     rows.push(row_data(_('Subtype'), _(ServiceTemplate::GENERIC_ITEM_SUBTYPES[record[:generic_subtype]]) || _("Custom"))) if catalog_provision?(record, :generic)
@@ -118,7 +118,7 @@ def catalog_basic_information(record, sb_params, tenants_tree)
       rows.push(row_data(_('Container Template'), provision_data(prov_data, :template_name)))
     end
 
-    unless catalog_provision?(record, :playbook)
+    unless catalog_provision?(record, :playbook) || catalog_provision?(record, :terraform_template)
       entry_points = [[_("Provisioning"), :fqname]]
       unless record.prov_type.try(:start_with?, "generic_")
         entry_points.push([_("Reconfigure"), :reconfigure_fqname], [_("Retirement"), :retire_fqname])
@@ -184,21 +184,31 @@ def catalog_resources(record)
     miq_structured_list(data)
   end
 
-  def catalog_generic_ansible_playbook_info(type, record, info)
+  def catalog_generic_template_info(type, record, info)
     list_type = type == :provision ? 'provisioning' : 'retirement'
     data = {:title => "#{list_type.camelize} %s" % _('Info'), :mode => "miq_catalog_playbook_info"}
     rows = []
     rows.push(row_data(_('Repository'), info[:repository]))
-    rows.push(row_data(_('Playbook'), info[:playbook]))
-    rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
-    rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-    rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
-    rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
-    rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
-    rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))
-    rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
-    rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
-    rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+    if record.type == 'ServiceTemplateAnsiblePlaybook'
+      rows.push(row_data(_('Playbook'), info[:playbook]))
+      rows.push(row_data(_('Machine Credential'), info[:machine_credential]))
+      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
+      rows.push(row_data(_('Vault Credential'), info[:vault_credential]))
+      rows.push(row_data(_('Cloud Credential'), info[:cloud_credential]))
+      rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
+      rows.push(row_data(_('Hosts'), record.config_info[type][:hosts]))
+      rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
+      rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
+      rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+    else
+      rows.push(row_data(_('Template'), info[:template]))
+      rows.push(row_data(_('Credential'), info[:credential]))
+      rows.push(row_data(_('Max TTL (mins)'), record.config_info[type][:execution_ttl]))
+      rows.push(row_data(_('Logging Output'), ViewHelper::LOG_OUTPUT_LEVELS[info[:log_output]]))
+      rows.push(row_data(_('Escalate Privilege'), info[:become_enabled]))
+      rows.push(row_data(_('Verbosity'), _(ViewHelper::VERBOSITY_LEVELS[info[:verbosity]])))
+      data[:rows] = rows
+    end
     data[:rows] = rows
     miq_structured_list(data)
   end
@@ -238,12 +248,13 @@ def catalog_dialog(provisioning)
   end
 
   def catalog_provision_types
-    {:generic       => "generic",
-     :orchestration => "generic_orchestration",
-     :ovf           => "generic_ovf_template",
-     :playbook      => "generic_ansible_playbook",
-     :tower         => "generic_ansible_tower",
-     :template      => "generic_container_template"}.freeze
+    {:generic            => "generic",
+     :orchestration      => "generic_orchestration",
+     :ovf                => "generic_ovf_template",
+     :playbook           => "generic_ansible_playbook",
+     :terraform_template => "generic_terraform_template",
+     :tower              => "generic_ansible_tower",
+     :template           => "generic_container_template"}.freeze
   end
 
   private
@@ -257,8 +268,8 @@ def catalog_tab_conditions(record)
       :detail     => record.display && !record.prov_type.try(:start_with?, "generic_"),
       :resource   => record.composite?,
       :request    => !record.prov_type || (record.prov_type && need_prov_dialogs?(record.prov_type)),
-      :provision  => record.prov_type == catalog_provision_types[:playbook],
-      :retirement => record.config_info.fetch_path(:retirement)
+      :provision  => record.prov_type == catalog_provision_types[:playbook] || record.prov_type == catalog_provision_types[:terraform_template],
+      :retirement => record.prov_type == catalog_provision_types[:terraform_template] ? nil : record.config_info.fetch_path(:retirement)
     }
   end
 

app/helpers/catalog_helper.rb

@@ -213,7 +213,7 @@ AnsiblePlayBookEditCatalogForm.propTypes = {
     tenantTree: PropTypes.shape({
       additional_tenants: PropTypes.arrayOf(PropTypes.any).isRequired,
       selectable: PropTypes.bool.isRequired,
-      ansible_playbook: PropTypes.bool.isRequired,
+      show_tenant_tree: PropTypes.bool.isRequired,
       catalog_bundle: PropTypes.bool.isRequired,
       locals_for_render: PropTypes.shape({
         tree_id: PropTypes.string.isRequired,