[katello-devel] [PATCH] Make it possible to include just pulp.

[Jan Pazdziora]

On Mon, Oct 03, 2011 at 02:33:55PM +0200, Jan Pazdziora wrote:
> 
> Please consider the following patch which moves the dependency

The patch was against
katello-configure-0.1.3-1.git.0.403cd32.el6.noarch, you probably
prefer patch against master, it's here:

---
 puppet/modules/katello/manifests/config.pp |    4 ++++
 puppet/modules/pulp/manifests/config.pp    |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/katello/manifests/config.pp b/puppet/modules/katello/manifests/config.pp
index a16cb31..f0e4c8e 100644
--- a/puppet/modules/katello/manifests/config.pp
+++ b/puppet/modules/katello/manifests/config.pp
@@ -61,4 +61,8 @@ class katello::config {
       require => Class["katello::install"];
     }
   }
+
+  Class["candlepin::config"] -> File["/etc/pulp/pulp.conf"]
+  Class["candlepin::config"] -> File["/etc/pulp/repo_auth.conf"]
+  Class["candlepin::config"] -> File["/etc/pki/content/pulp-global-repo.ca"]
 }
diff --git a/puppet/modules/pulp/manifests/config.pp b/puppet/modules/pulp/manifests/config.pp
index 4db5011..374bf2f 100644
--- a/puppet/modules/pulp/manifests/config.pp
+++ b/puppet/modules/pulp/manifests/config.pp
@@ -6,14 +6,14 @@ class pulp::config {
     "/etc/pulp/pulp.conf":
       content => template("pulp/etc/pulp/pulp.conf.erb"),
       before => [Class["apache2::service"]],
-      require => [Class["pulp::install"], Class["candlepin::config"]];
+      require => [Class["pulp::install"]];
     "/etc/pulp/repo_auth.conf":
       content => template("pulp/etc/pulp/repo_auth.conf.erb"),
       before => [Class["apache2::service"]],
-      require => [Class["pulp::install"], Class["candlepin::config"]];
+      require => [Class["pulp::install"]];
     "/etc/pki/content/pulp-global-repo.ca":
       target => $pulp::params::ssl_certificate_ca_file,
-      require => [Class["pulp::install"], Class["candlepin::config"]];
+      require => [Class["pulp::install"]];
   }
 
   exec {"migrate_pulp_db":
-- 
1.7.4.4


-- 
Jan Pazdziora
Principal Software Engineer, Satellite Engineering, Red Hat