From 82201090c843a54727d699597833f1294a3f8e69 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Mon, 8 Aug 2016 18:43:09 -0400 Subject: [PATCH] Fixes #16012 - fix upgrade content view puppet env error --- app/models/katello/glue/pulp/repo.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/katello/glue/pulp/repo.rb b/app/models/katello/glue/pulp/repo.rb index b0cafe30140..8aba83656dd 100644 --- a/app/models/katello/glue/pulp/repo.rb +++ b/app/models/katello/glue/pulp/repo.rb @@ -185,21 +185,21 @@ def importer_ssl_options(capsule = nil) :ssl_client_cert => ueber_cert[:cert], :ssl_client_key => ueber_cert[:key], :ssl_ca_cert => ::Cert::Certs.ca_cert, - :ssl_validation => verify_ssl_on_sync? + :ssl_validation => try(:verify_ssl_on_sync?) } - elsif redhat? && self.content_view.default? + elsif self.try(:redhat?) && self.content_view.default? { :ssl_client_cert => self.product.certificate, :ssl_client_key => self.product.key, :ssl_ca_cert => Resources::CDN::CdnResource.ca_file_contents, - :ssl_validation => verify_ssl_on_sync? + :ssl_validation => try(:verify_ssl_on_sync?) } else { :ssl_client_cert => nil, :ssl_client_key => nil, :ssl_ca_cert => nil, - :ssl_validation => verify_ssl_on_sync? + :ssl_validation => try(:verify_ssl_on_sync?) } end end