From 233e31a9dea0053731ff64cb5ac6ddf92eef7172 Mon Sep 17 00:00:00 2001
From: John Mitsch <jomitsch@redhat.com>
Date: Thu, 10 Mar 2016 14:13:10 -0500
Subject: [PATCH] Fixes #13200 - Ensure that the capsule installer sets up a
 standart pulp server

---
 manifests/init.pp                             | 20 ++++---------------
 metadata.json                                 |  4 ++--
 spec/classes/capsule_spec.rb                  |  2 +-
 ...hild_gpg_proxy.erb => _pulp_gpg_proxy.erb} |  0
 4 files changed, 7 insertions(+), 19 deletions(-)
 rename templates/{_pulp_child_gpg_proxy.erb => _pulp_gpg_proxy.erb} (100%)

diff --git a/manifests/init.pp b/manifests/init.pp
index c1a72987..5c937811 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -160,6 +160,7 @@
     }
 
     class { '::certs::qpid': } ~>
+    class { '::certs::qpid_client': } ~>
     class { '::qpid':
       ssl                    => true,
       ssl_cert_db            => $::certs::nss_db_dir,
@@ -183,7 +184,7 @@
       broker_url                => "qpid://${qpid_router_broker_addr}:${qpid_router_broker_port}",
       broker_use_ssl            => true,
       manage_broker             => false,
-      manage_httpd              => false,
+      manage_httpd              => true,
       manage_plugins_httpd      => true,
       manage_squid              => true,
       repo_auth                 => true,
@@ -191,22 +192,10 @@
       node_oauth_key            => $pulp_oauth_key,
       node_oauth_secret         => $pulp_oauth_secret,
       node_server_ca_cert       => $certs::params::pulp_server_ca_cert,
-    } ~>
-    class { '::pulp::child':
-      parent_fqdn          => $parent_fqdn,
-      oauth_effective_user => $pulp_oauth_effective_user,
-      oauth_key            => $pulp_oauth_key,
-      oauth_secret         => $pulp_oauth_secret,
-      server_ca_cert       => $certs::params::pulp_server_ca_cert,
-    }
-
-    pulp::child::fragment{'gpg_key_proxy':
-      ssl_content => template('capsule/_pulp_child_gpg_proxy.erb'),
     }
 
-    class { '::certs::pulp_child':
-      hostname => $capsule_fqdn,
-      notify   => [ Class['pulp'], Class['pulp::child'] ],
+    pulp::apache::fragment{'gpg_key_proxy':
+      ssl_content => template('capsule/_pulp_gpg_proxy.erb'),
     }
   }
 
@@ -243,7 +232,6 @@
 
     if $pulp {
       Certs::Tar_extract[$certs_tar] -> Class['certs'] -> Class['::certs::qpid']
-      Certs::Tar_extract[$certs_tar] -> Class['certs::pulp_child']
     }
 
     if $puppet {
diff --git a/metadata.json b/metadata.json
index 9bb0cf31..362df484 100644
--- a/metadata.json
+++ b/metadata.json
@@ -38,7 +38,7 @@
     },
     {
       "name": "katello-pulp",
-      "version_requirement": ">= 3.1.0 < 4.0.0"
+      "version_requirement": ">= 3.2.0 < 4.0.0"
     },
     {
       "name": "katello-qpid",
@@ -50,7 +50,7 @@
     },
     {
       "name": "katello-certs",
-      "version_requirement": ">= 0.1.0 < 1.0.0"
+      "version_requirement": ">= 0.5.0 < 1.0.0"
     }
   ],
   "requirements": [
diff --git a/spec/classes/capsule_spec.rb b/spec/classes/capsule_spec.rb
index b82484dd..0860a159 100644
--- a/spec/classes/capsule_spec.rb
+++ b/spec/classes/capsule_spec.rb
@@ -42,7 +42,7 @@ class {'apache': apache_version => '2.4'}"
     it { should contain_class('crane').with( {'key' => '/etc/pki/katello/private/katello-apache.key',
                                               'cert' => '/etc/pki/katello/certs/katello-apache.crt'} ) }
 
-    it { should contain_pulp__child__fragment('gpg_key_proxy').with({
+    it { should contain_pulp__apache__fragment('gpg_key_proxy').with({
            :ssl_content => %r{ProxyPass /katello/api/repositories/}} ) }
   end
 
diff --git a/templates/_pulp_child_gpg_proxy.erb b/templates/_pulp_gpg_proxy.erb
similarity index 100%
rename from templates/_pulp_child_gpg_proxy.erb
rename to templates/_pulp_gpg_proxy.erb