Remove Certguard and File installation as plugin

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

Hide file tree

Showing 13 changed files with 73 additions and 136 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -81,4 +81,28 @@
     mode    => '0640',
     require => Exec['Create database symmetric key'],
   }
+
+  if $pulpcore::use_pulp2_file_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
@@ -197,6 +197,9 @@
 #   What percentage of available-workers will pulpcore use for import tasks at a time.
 #   By default, pulpcore will use all available workers.
 #
+# @param use_pulp2_file_content_route
+#   Whether to redirect the legacy (Pulp 2) URLs to the content server
+#
 # @example Default configuration
 #   include pulpcore
 #
@@ -257,6 +260,7 @@
   Optional[Boolean] $analytics = undef,
   Optional[Boolean] $hide_guarded_distributions = undef,
   Optional[Integer[1,100]] $import_workers_percent = undef,
+  Boolean $use_pulp2_file_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/deb.pp b/manifests/plugin/deb.pp
@@ -1,14 +1,14 @@
 # @summary Pulp Deb plugin
-# @param use_pulp2_content_route
+# @param use_pulp2_file_content_route
 #   Whether to redirect the legacy (Pulp 2) URL, /pulp/deb/, to the content server
 # @param force_ignore_missing_package_indices
 #   Wheter to set the FORCE_IGNORE_MISSING_PACKAGE_INDICES setting to True or
 #   False in /etc/pulp/settings.py.
 class pulpcore::plugin::deb (
-  Boolean $use_pulp2_content_route = false,
+  Boolean $use_pulp2_file_content_route = false,
   Boolean $force_ignore_missing_package_indices = true,
 ) {
-  if $use_pulp2_content_route {
+  if $use_pulp2_file_content_route {
     $context = {
       'directories' => [
         {

diff --git a/manifests/plugin/file.pp b/manifests/plugin/file.pp
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -16,10 +16,10 @@
 
   yumrepo { 'pulpcore':
     descr    => "Pulpcore ${version}",
-    baseurl  => pick($baseurl, "https://yum.theforeman.org/pulpcore/${version}/${dist_tag}/\$basearch"),
+    baseurl  => pick($baseurl, "https://stagingyum.theforeman.org/pulpcore/${version}/${dist_tag}/\$basearch"),
     enabled  => '1',
     gpgcheck => if $gpgkey == '' or $version == 'nightly' { '0' } else { '1' },
-    gpgkey   => pick($gpgkey, "https://yum.theforeman.org/pulpcore/${version}/GPG-RPM-KEY-pulpcore"),
+    gpgkey   => pick($gpgkey, "https://stagingyum.theforeman.org/pulpcore/${version}/GPG-RPM-KEY-pulpcore"),
     notify   => Anchor['pulpcore::repo'],
   }
 

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/...cceptance/use_pulp2_content_route_spec.rb → ...cceptance/use_pulp2_file_content_route.rb b/...cceptance/use_pulp2_content_route_spec.rb → ...cceptance/use_pulp2_file_content_route.rb
@@ -4,13 +4,12 @@
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do
       <<-PUPPET
-      include pulpcore
+      class { 'pulpcore':
+      use_pulp2_file_content_route => true,
+      } 
       include pulpcore::plugin::certguard
       include pulpcore::plugin::container
       include pulpcore::plugin::deb
-      class { 'pulpcore::plugin::file':
-        use_pulp2_content_route => true,
-      }
       class { 'pulpcore::plugin::rpm':
         use_pulp2_content_route => true,
       }

diff --git a/spec/classes/plugin_certguard_spec.rb b/spec/classes/plugin_certguard_spec.rb
diff --git a/spec/classes/plugin_deb_spec.rb b/spec/classes/plugin_deb_spec.rb
@@ -32,7 +32,7 @@
         end
 
         context 'with pulp2 content route' do
-          let(:params) { { use_pulp2_content_route: true } }
+          let(:params) { { use_pulp2_file_content_route: true } }
 
           it 'contains the Apache fragment' do
             is_expected.to compile.with_all_deps

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_file_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

diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
@@ -9,9 +9,9 @@
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_anchor('pulpcore::repo') }
         it { is_expected.to contain_yumrepo('pulpcore')
-          .with_baseurl(%r{https://yum.theforeman.org/pulpcore/\d+\.\d+/el\d+/\$basearch$})
+          .with_baseurl(%r{https://stagingyum.theforeman.org/pulpcore/\d+\.\d+/el\d+/\$basearch$})
           .with_gpgcheck(1)
-          .with_gpgkey(%r{https://yum.theforeman.org/pulpcore/\d+\.\d+/GPG-RPM-KEY-pulpcore})
+          .with_gpgkey(%r{https://stagingyum.theforeman.org/pulpcore/\d+\.\d+/GPG-RPM-KEY-pulpcore})
           .that_notifies('Anchor[pulpcore::repo]')
         }
       end
@@ -26,7 +26,7 @@
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_yumrepo('pulpcore')
-          .with_baseurl(%r{https://yum.theforeman.org/pulpcore/nightly/el\d+/\$basearch$})
+          .with_baseurl(%r{https://stagingyum.theforeman.org/pulpcore/nightly/el\d+/\$basearch$})
           .with_gpgcheck(0)
           .that_notifies('Anchor[pulpcore::repo]')
         }