Use Stdlib::HTTPUrl to support setting a proxy protocol

theforeman · Dec 20, 2019 · 37104d7 · 37104d7
1 parent ac38043
commit 37104d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -21,7 +21,7 @@
 class katello::application (
   Integer[0] $rest_client_timeout = 3600,
   Optional[Enum['SSLv23', 'TLSv1', '']] $cdn_ssl_version = undef,
-  Optional[Stdlib::Host] $proxy_host = undef,
+  Optional[Stdlib::HTTPUrl] $proxy_host = undef,
   Optional[Stdlib::Port] $proxy_port = undef,
   Optional[String] $proxy_username = undef,
   Optional[String] $proxy_password = undef,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -111,7 +111,7 @@
   Stdlib::Host $qpid_hostname = 'localhost',
   Optional[Integer[1]] $num_pulp_workers = undef,
   Integer[0] $pulp_worker_timeout = 60,
-  Optional[Stdlib::Host] $proxy_url = undef,
+  Optional[Stdlib::HTTPUrl] $proxy_url = undef,
   Optional[Stdlib::Port] $proxy_port = undef,
   Optional[String] $proxy_username = undef,
   Optional[String] $proxy_password = undef,

diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -95,7 +95,7 @@ class { 'katello::params':
           {
             rest_client_timeout: 4000,
             cdn_ssl_version: 'TLSv1',
-            proxy_host: 'myproxy.example.org',
+            proxy_host: 'http://myproxy.example.org',
             proxy_port: 8888,
             proxy_username: 'admin',
             proxy_password: 'secret_password',
@@ -131,7 +131,7 @@ class { 'katello::params':
             '    :crane_url: https://foo.example.com:5000',
             '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt',
             '  :cdn_proxy:',
-            '    :host: myproxy.example.org',
+            '    :host: http://myproxy.example.org',
             '    :port: 8888',
             '    :user: "admin"',
             '    :password: "secret_password"',