Skip to content

Commit 87e7e65

Browse files
committed
Add TerraformEnterprise ServiceCatalog support
1 parent b97b77c commit 87e7e65

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

app/controllers/catalog_controller.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ def atomic_req_submit
10091009
end
10101010

10111011
# for Ansible Tower items, check for Provider first
1012-
if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx'
1012+
if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' || @edit[:new][:st_prov_type] == 'generic_terraform_enterprise'
10131013
if @edit[:new][:manager_id].blank?
10141014
add_flash(_("Provider is required, please select one from the list"), :error)
10151015
elsif @edit[:new][:template_id].blank?
@@ -1304,7 +1304,7 @@ def set_form_vars
13041304
@available_catalogs = available_catalogs.sort # Get available catalogs with tenants and ancestors
13051305
@additional_tenants = @edit[:new][:tenant_ids].map(&:to_s) # Get ids of selected Additional Tenants in the Tenants tree
13061306
available_orchestration_templates if @record.kind_of?(ServiceTemplateOrchestration)
1307-
available_automation_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx)
1307+
available_automation_managers if @record.kind_of?(ServiceTemplateAnsibleTower) || @record.kind_of?(ServiceTemplateAwx) || @record.kind_of?(ServiceTemplateTerraformEnterprise)
13081308
available_container_managers if @record.kind_of?(ServiceTemplateContainerTemplate)
13091309
fetch_zones
13101310
@edit[:new][:zone_id] = @record.zone_id
@@ -1529,7 +1529,7 @@ def get_form_vars
15291529
end
15301530

15311531
get_form_vars_orchestration if @edit[:new][:st_prov_type] == 'generic_orchestration'
1532-
fetch_form_vars_ansible_or_ct if %w[generic_ansible_tower generic_awx generic_container_template].include?(@edit[:new][:st_prov_type])
1532+
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])
15331533
fetch_form_vars_ovf_template if @edit[:new][:st_prov_type] == 'generic_ovf_template'
15341534
fetch_form_vars_server_profile_templates if @edit[:new][:st_prov_type] == 'cisco_intersight'
15351535
end
@@ -1591,7 +1591,7 @@ def fetch_form_vars_ansible_or_ct
15911591
@edit[:new][:manager_id] = nil
15921592
else
15931593
@edit[:new][:manager_id] = params[:manager_id]
1594-
available_job_templates(params[:manager_id]) if @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx'
1594+
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'
15951595
available_container_templates(params[:manager_id]) if @edit[:new][:st_prov_type] == 'generic_container_template'
15961596
end
15971597
end
@@ -1622,7 +1622,7 @@ def available_orchestration_templates
16221622
end
16231623

16241624
def available_container_templates(manager_id)
1625-
method = @edit[:new][:st_prov_type] == 'generic_ansible_tower' || @edit[:new][:st_prov_type] == 'generic_awx' ? 'configuration_scripts' : 'container_templates'
1625+
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'
16261626
@edit[:new][:available_templates] =
16271627
ExtManagementSystem.find_by(:id => manager_id).send(method).collect { |t| [t.name, t.id] }.sort
16281628
end

app/views/catalog/_form_basic_info.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
:class => "selectpicker")
139139
:javascript
140140
miqSelectPickerEvent('manager_id', '#{url}')
141-
- elsif %w(generic_ansible_tower generic_awx generic_container_template).include?(@edit[:new][:st_prov_type])
141+
- elsif %w(generic_ansible_tower generic_awx generic_terraform_enterprise generic_container_template).include?(@edit[:new][:st_prov_type])
142142
- opts = [["<#{_('Choose')}>", nil]] + @edit[:new][:available_managers]
143143
.form-group
144144
%label.col-md-2.control-label
@@ -155,7 +155,7 @@
155155
%label.col-md-2.control-label
156156
= @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx" ? _('Ansible Template') : _('Container Template')
157157
.col-md-10
158-
- if @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx"
158+
- if @edit[:new][:st_prov_type] == "generic_ansible_tower" || @edit[:new][:st_prov_type] == "generic_awx" || @edit[:new][:st_prov_type] == "generic_terraform_enterprise"
159159
= select_tag('template_id',
160160
grouped_options_for_select(@edit[:new][:available_templates], @edit[:new][:template_id]),
161161
"data-miq_sparkle_on" => true,

0 commit comments

Comments
 (0)