Merge pull request #2491 from zeari/fix_endpoints

Fix container provider endpoint configuration
ManageIQ · Oct 27, 2017 · 81cbdc1 · 81cbdc1
2 parents 58db012 + 031eca4
commit 81cbdc1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/controllers/mixins/ems_common_angular.rb b/app/controllers/mixins/ems_common_angular.rb
@@ -517,17 +517,16 @@ def set_ems_record_vars(ems, mode = nil)
         default_endpoint = {:role => :default, :hostname => hostname, :port => port}
         default_endpoint.merge!(endpoint_security_options(ems.security_protocol, default_tls_ca_certs))
         if params[:metrics_selection] == 'hawkular'
-          params[:cred_type] = "hawkular"
+          params[:cred_type] = "hawkular" if params[:cred_type] == "metrics"
           hawkular_endpoint = {:role => :hawkular, :hostname => metrics_hostname, :port => metrics_port}
           hawkular_endpoint.merge!(endpoint_security_options(metrics_security_protocol, metrics_tls_ca_certs))
         elsif params[:metrics_selection] == 'prometheus'
-          params[:cred_type] = "prometheus"
+          params[:cred_type] = "prometheus" if params[:cred_type] == "metrics"
           prometheus_endpoint = {:role => :prometheus, :hostname => metrics_hostname, :port => metrics_port}
           prometheus_endpoint.merge!(endpoint_security_options(metrics_security_protocol, metrics_tls_ca_certs))
         end
 
         if params[:alerts_selection] == 'prometheus'
-          params[:cred_type] = "prometheus_alerts"
           prometheus_alerts_endpoint = {:role => :prometheus_alerts, :hostname => prometheus_alerts_hostname, :port => prometheus_alerts_api_port}
           prometheus_alerts_endpoint.merge!(endpoint_security_options(prometheus_alerts_security_protocol, prometheus_alerts_tls_ca_certs))
         end