Remove Certguard and File installation as plugin

It was now merged into pulpcore
theforeman · Mar 28, 2024 · df62525 · df62525
1 parent 738ca5a
commit df62525
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 123 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -81,4 +81,28 @@
     mode    => '0640',
     require => Exec['Create database symmetric key'],
   }
+
+  if $use_pulp2_content_route {
+    $context = {
+      'directories' => [
+        {
+          'provider'        => 'location',
+          'path'            => '/pulp/isos',
+          'proxy_pass'      => [
+            {
+              'url'    => $pulpcore::apache::content_url,
+              'params' => $pulpcore::apache::content_proxy_params,
+            },
+          ],
+          'request_headers' => [
+            'unset X-CLIENT-CERT',
+            'set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT',
+          ],
+        },
+      ],
+    }
+    $content = epp('pulpcore/apache-fragment.epp', $context)
+  } else {
+    $content = undef
+  }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -257,6 +257,7 @@
   Optional[Boolean] $analytics = undef,
   Optional[Boolean] $hide_guarded_distributions = undef,
   Optional[Integer[1,100]] $import_workers_percent = undef,
+  Optional[Boolean] $use_pulp2_content_route = false,
 ) {
   $settings_file = "${config_dir}/settings.py"
   $certs_dir = "${config_dir}/certs"

diff --git a/manifests/plugin/certguard.pp b/manifests/plugin/certguard.pp
diff --git a/manifests/plugin/file.pp b/manifests/plugin/file.pp
diff --git a/spec/acceptance/plugins_spec.rb b/spec/acceptance/plugins_spec.rb
@@ -6,10 +6,8 @@
       <<-PUPPET
       include pulpcore
       include pulpcore::plugin::ansible
-      include pulpcore::plugin::certguard
       include pulpcore::plugin::container
       include pulpcore::plugin::deb
-      include pulpcore::plugin::file
       include pulpcore::plugin::ostree
       include pulpcore::plugin::python
       include pulpcore::plugin::rpm

diff --git a/spec/classes/plugin_certguard_spec.rb b/spec/classes/plugin_certguard_spec.rb
diff --git a/spec/classes/plugin_file_spec.rb b/spec/classes/plugin_file_spec.rb
diff --git a/spec/classes/pulpcore_spec.rb b/spec/classes/pulpcore_spec.rb
@@ -656,6 +656,39 @@
             is_expected.to contain_service("pulpcore-worker@#{i}.service")
               .with_ensure(true)
               .with_enable(true)
+        end
+
+          context 'with pulp2 content route' do
+            let(:params) { { use_pulp2_content_route: true } }
+
+            it 'contains the Apache fragment' do
+              is_expected.to compile.with_all_deps
+              is_expected.to contain_pulpcore__apache__fragment('plugin-file')
+              is_expected.to contain_apache__vhost__fragment('pulpcore-http-plugin-file')
+                .with_content(
+  <<CONTENT
+  
+    <Location "/pulp/isos">
+      RequestHeader unset X-CLIENT-CERT
+      RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
+      ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
+      ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
+    </Location>
+  CONTENT
+                )
+              is_expected.to contain_apache__vhost__fragment('pulpcore-https-plugin-file')
+                .with_content(
+  <<CONTENT
+  
+    <Location "/pulp/isos">
+      RequestHeader unset X-CLIENT-CERT
+      RequestHeader set X-CLIENT-CERT "%{SSL_CLIENT_CERT}s" env=SSL_CLIENT_CERT
+      ProxyPass unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content disablereuse=on timeout=600
+      ProxyPassReverse unix:///run/pulpcore-content.sock|http://pulpcore-content/pulp/content
+    </Location>
+  CONTENT
+                )
+            end
           end
         end
       end