Skip to content

Commit

Permalink
Merge pull request #3971 from masayag/do_not_override_kubevirt_token
Browse files Browse the repository at this point in the history
Do not override kubevirt token with default token
  • Loading branch information
mzazrivec authored May 29, 2018
2 parents 0f77639 + 344f8d4 commit f0de31e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/mixins/ems_common_angular.rb
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ def build_credentials(ems, mode)
creds[:prometheus_alerts] = {:auth_key => default_key, :save => (mode != :validate)}
end
if params[:virtualization_selection] == 'kubevirt'
kubevirt_key = params[:kubevirt_password] ? params[:kubevirt_password] : default_key
kubevirt_key = params[:kubevirt_password] ? params[:kubevirt_password] : ems.authentication_key(:kubevirt)
creds[:kubevirt] = { :auth_key => kubevirt_key, :save => (mode != :validate) }
end
creds[:bearer] = {:auth_key => default_key, :save => (mode != :validate)}
Expand Down

0 comments on commit f0de31e

Please sign in to comment.