Skip to content

Commit

Permalink
Merge pull request #2651 from jhernand/send_ovirt_metrics_to_raw_connect
Browse files Browse the repository at this point in the history
Send oVirt metrics details to `raw_connect`
(cherry picked from commit 30cd822)

https://bugzilla.redhat.com/show_bug.cgi?id=1511079
martinpovolny authored and simaishi committed Nov 15, 2017
1 parent fc2d630 commit a3e75c3
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions app/controllers/mixins/ems_common_angular.rb
Original file line number Diff line number Diff line change
@@ -141,15 +141,21 @@ def get_task_args(ems)
when 'ManageIQ::Providers::Openstack::InfraManager'
[password, params.except(:default_password)]
when 'ManageIQ::Providers::Redhat::InfraManager'
metrics_user, metrics_password = params[:metrics_userid], MiqPassword.encrypt(params[:metrics_password])
[{
:username => user,
:password => password,
:server => params[:default_hostname],
:port => params[:default_api_port],
:scheme => 'https',
:version => 4,
:verify_ssl => params[:default_tls_verify] == 'on' ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE,
:ca_certs => params[:default_tls_ca_certs],
:username => user,
:password => password,
:server => params[:default_hostname],
:port => params[:default_api_port],
:scheme => 'https',
:version => 4,
:verify_ssl => params[:default_tls_verify] == 'on' ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE,
:ca_certs => params[:default_tls_ca_certs],
:metrics_username => metrics_user,
:metrics_password => metrics_password,
:metrics_server => params[:metrics_hostname],
:metrics_port => params[:metrics_api_port],
:metrics_database => params[:metrics_database_name],
}]
when 'ManageIQ::Providers::Vmware::InfraManager'
[{:pass => password, :user => user, :ip => params[:default_hostname]}]

0 comments on commit a3e75c3

Please sign in to comment.