Merge pull request #17184 from lfu/ansible_vault_credential

Add vault credential support to Ansible playbook service template.
ManageIQ · Mar 21, 2018 · f2ad37a · f2ad37a
2 parents 9b54d98 + 635d8ca
commit f2ad37a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/models/service_template_ansible_playbook.rb b/app/models/service_template_ansible_playbook.rb
@@ -105,7 +105,7 @@ def self.build_parameter_list(name, description, info)
       end.to_json
     end
 
-    [:credential, :cloud_credential, :network_credential].each do |credential|
+    %i(credential vault_credential cloud_credential network_credential).each do |credential|
       cred_sym = "#{credential}_id".to_sym
       params[credential] = Authentication.find(info[cred_sym]).manager_ref if info[cred_sym]
     end

diff --git a/spec/models/service_template_ansible_playbook_spec.rb b/spec/models/service_template_ansible_playbook_spec.rb
@@ -2,6 +2,7 @@
   let(:user)     { FactoryGirl.create(:user_with_group) }
   let(:auth_one) { FactoryGirl.create(:authentication, :manager_ref => 6) }
   let(:auth_two) { FactoryGirl.create(:authentication, :manager_ref => 10) }
+  let(:auth_three) { FactoryGirl.create(:authentication, :manager_ref => 14) }
 
   let(:script_source) { FactoryGirl.create(:configuration_script_source, :manager => ems) }
 
@@ -35,6 +36,7 @@
           :verbosity             => 3,
           :credential_id         => auth_one.id,
           :network_credential_id => auth_two.id,
+          :vault_credential_id   => auth_three.id,
           :playbook_id           => playbook.id
         },
       }
@@ -134,7 +136,8 @@
         :become_enabled     => true,
         :verbosity          => 3,
         :credential         => '6',
-        :network_credential => '10'
+        :network_credential => '10',
+        :vault_credential   => '14'
       )
 
       expect(params.keys).to_not include(:extra_vars, :cloud_credentials)