From dd82a94ca6d55f25434373a8e16c42045b21946b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josejulio=20Mart=C3=ADnez?= Date: Thu, 2 Mar 2017 11:51:00 -0600 Subject: [PATCH] Renames container_security_options to container_security_options --- app/controllers/mixins/ems_common_angular.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/mixins/ems_common_angular.rb b/app/controllers/mixins/ems_common_angular.rb index 45df717a35b..66a5f68fd70 100644 --- a/app/controllers/mixins/ems_common_angular.rb +++ b/app/controllers/mixins/ems_common_angular.rb @@ -424,19 +424,19 @@ def set_ems_record_vars(ems, mode = nil) if ems.kind_of?(ManageIQ::Providers::ContainerManager) params[:cred_type] = ems.default_authentication_type if params[:cred_type] == "default" default_endpoint = {:role => :default, :hostname => hostname, :port => port} - default_endpoint.merge!(container_security_options(ems.security_protocol, default_tls_ca_certs)) + default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs)) if hawkular_hostname.blank? default_key = params[:default_password] || ems.authentication_key hawkular_hostname = get_hostname_from_routes(ems, default_endpoint, default_key) end hawkular_endpoint = {:role => :hawkular, :hostname => hawkular_hostname, :port => hawkular_api_port} - hawkular_endpoint.merge!(container_security_options(hawkular_security_protocol, hawkular_tls_ca_certs)) + hawkular_endpoint.merge!(endpoint_security_options(hawkular_security_protocol, hawkular_tls_ca_certs)) end if ems.kind_of?(ManageIQ::Providers::MiddlewareManager) default_endpoint = {:role => :default, :hostname => hostname, :port => port} - default_endpoint.merge!(container_security_options(ems.security_protocol, default_tls_ca_certs)) + default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs)) end if ems.kind_of?(ManageIQ::Providers::Hawkular::DatawarehouseManager) @@ -473,7 +473,7 @@ def get_hostname_from_routes(ems, endpoint_hash, token) nil end - def container_security_options(security_protocol, certificate_authority) + def endpoint_security_options(security_protocol, certificate_authority) { :security_protocol => security_protocol, :verify_ssl => %w(ssl-without-validation non-ssl).exclude?(security_protocol),