No longer configure pulp2 global proxy

theforeman · Aug 13, 2019 · 4e3df18 · 4e3df18
1 parent a7651ed
commit 4e3df18
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/manifests/pulp.pp b/manifests/pulp.pp
@@ -1,9 +1,5 @@
 # Katello configuration for pulp
 class katello::pulp (
-  Optional[String] $proxy_url = $katello::proxy_url,
-  Optional[Integer[0, 65535]] $proxy_port = $katello::proxy_port,
-  Optional[String] $proxy_username = $katello::proxy_username,
-  Optional[String] $proxy_password = $katello::proxy_password,
   Optional[String] $yum_max_speed = $katello::pulp_max_speed,
   Boolean $enable_ostree = $katello::enable_ostree,
   Boolean $enable_yum = $katello::enable_yum,
@@ -54,10 +50,6 @@
     messaging_auth_enabled => false,
     broker_url             => $broker_url,
     broker_use_ssl         => true,
-    proxy_url              => $proxy_url,
-    proxy_port             => $proxy_port,
-    proxy_username         => $proxy_username,
-    proxy_password         => $proxy_password,
     yum_max_speed          => $yum_max_speed,
     manage_broker          => false,
     manage_httpd           => false,

diff --git a/spec/classes/katello_pulp_spec.rb b/spec/classes/katello_pulp_spec.rb
@@ -29,10 +29,6 @@ class { '::katello':
             .with_messaging_auth_enabled(false)
             .with_broker_url('qpid://localhost:5671')
             .with_broker_use_ssl(true)
-            .with_proxy_url(nil)
-            .with_proxy_port(nil)
-            .with_proxy_username(nil)
-            .with_proxy_password(nil)
             .with_yum_max_speed(nil)
             .with_manage_broker(false)
             .with_manage_httpd(false)