app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb in katello-4.3.0.rc3 vs app/controllers/katello/concerns/api/v2/registration_controller_extensions.rb in katello-4.3.0.rc4
- old
+ new
@@ -26,11 +26,11 @@
super
end
def context_urls
- super.merge(rhsm_url: rhsm_url, pulp_content_url: pulp_content_url)
+ super.merge(rhsm_url: smart_proxy.rhsm_url, pulp_content_url: smart_proxy.pulp_content_url)
end
private
def smart_proxy
@@ -40,17 +40,9 @@
fail Foreman::Exception, _('Smart proxy content source not found!') unless proxy
fail Foreman::Exception, _('Pulp 3 is not enabled on Smart proxy!') unless proxy.pulp3_enabled?
proxy
end
- end
-
- def rhsm_url
- URI(smart_proxy.rhsm_url)
- end
-
- def pulp_content_url
- smart_proxy.setting(SmartProxy::PULP3_FEATURE, 'content_app_url')
end
end
end
end