Merge pull request #6688 from martinpovolny/more_a_methods

Load inputs for Ansible* methods. (cherry picked from commit 9c9e879) https://bugzilla.redhat.com/show_bug.cgi?id=1794780
ManageIQ · Apr 3, 2020 · e541c43 · e541c43
1 parent 8e8c426
commit e541c43
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/controllers/miq_ae_class_controller.rb b/app/controllers/miq_ae_class_controller.rb
@@ -1021,19 +1021,21 @@ def method_form_fields
       :managers            => list_of_managers,
       :manager_id          => manager_id,
       :available_datatypes => MiqAeField.available_datatypes_for_ui,
-      :config_info         => { :repository_id         => method.options[:repository_id] || '',
-                                :ansible_template_id   => method.options[:ansible_template_id] || '',
-                                :playbook_id           => method.options[:playbook_id] || '',
-                                :credential_id         => method.options[:credential_id] || '',
-                                :vault_credential_id   => method.options[:vault_credential_id] || '',
-                                :network_credential_id => method.options[:network_credential_id] || '',
-                                :cloud_credential_id   => method.options[:cloud_credential_id] || '',
-                                :verbosity             => method.options[:verbosity],
-                                :become_enabled        => method.options[:become_enabled] || false,
-                                :execution_ttl         => method.options[:execution_ttl] || '',
-                                :hosts                 => method.options[:hosts] || 'localhost',
-                                :log_output            => method.options[:log_output] || 'on_error',
-                                :extra_vars            => location == 'playbook' && method.inputs }
+      :config_info         => {
+        :repository_id         => method.options[:repository_id] || '',
+        :ansible_template_id   => method.options[:ansible_template_id] || '',
+        :playbook_id           => method.options[:playbook_id] || '',
+        :credential_id         => method.options[:credential_id] || '',
+        :vault_credential_id   => method.options[:vault_credential_id] || '',
+        :network_credential_id => method.options[:network_credential_id] || '',
+        :cloud_credential_id   => method.options[:cloud_credential_id] || '',
+        :verbosity             => method.options[:verbosity],
+        :become_enabled        => method.options[:become_enabled] || false,
+        :execution_ttl         => method.options[:execution_ttl] || '',
+        :hosts                 => method.options[:hosts] || 'localhost',
+        :log_output            => method.options[:log_output] || 'on_error',
+        :extra_vars            => playbook_style_location?(location) && method.inputs
+      }
     }
     render :json => method_hash
   end

diff --git a/app/views/miq_ae_class/_method_inputs.html.haml b/app/views/miq_ae_class/_method_inputs.html.haml
@@ -63,7 +63,7 @@
         .form-group
           = format_form_group(_('Max TTL'), @playbook_details[:execution_ttl])
 
-        - if @ae_method.location == 'playbook'
+        - if %w[playbook ansible_job_template].include?(@ae_method.location)
           .form-group
             = format_form_group(_('Hosts'), @playbook_details[:hosts])
         .form-group