Skip to content

Commit

Permalink
Merge pull request ManageIQ#17218 from slemrmartin/validate-new-provi…
Browse files Browse the repository at this point in the history
…der-with-proxy

Makes http_proxy_uri class method
  • Loading branch information
agrare authored Mar 28, 2018
2 parents 1d647ba + b6d0534 commit 1c45ec3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion app/models/manageiq/providers/base_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ def refresher
end

def http_proxy_uri
VMDB::Util.http_proxy_uri(emstype.try(:to_sym)) || VMDB::Util.http_proxy_uri
self.class.http_proxy_uri
end

def self.http_proxy_uri
VMDB::Util.http_proxy_uri(ems_type.try(:to_sym)) || VMDB::Util.http_proxy_uri
end

def self.default_blacklisted_event_names
Expand Down

0 comments on commit 1c45ec3

Please sign in to comment.