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

[Jan Pazdziora]

Hello,

while investigating some installation issue, I wanted to debug just
the pulp puppet manifests. However, calling

	echo include pulp | puppet --modulepath /usr/share/katello/install/puppet/modules

failed with

	Could not find dependency Class[Candlepin::Config] for File[/etc/pulp/pulp.conf] at /usr/share/katello/install/puppet/modules/pulp/manifests/config.pp:9

Please consider the following patch which moves the dependency
to katello config. In other words, if we are configuring katello,
then the order of the components matters but if we just configure
pulp, we should not depend on candlepin.

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

diff --git a/puppet/modules/katello/manifests/config.pp b/puppet/modules/katello/manifests/config.pp
index 606a5b8..faa0ba7 100644
--- a/puppet/modules/katello/manifests/config.pp
+++ b/puppet/modules/katello/manifests/config.pp
@@ -72,4 +72,6 @@ class katello::config {
       require => Class["katello::install"];
     }
   }
+
+  Class["candlepin::config"] -> File["/etc/pulp/pulp.conf"]
 }
diff --git a/puppet/modules/pulp/manifests/config.pp b/puppet/modules/pulp/manifests/config.pp
index 2d2ae0d..cc4d6b6 100644
--- a/puppet/modules/pulp/manifests/config.pp
+++ b/puppet/modules/pulp/manifests/config.pp
@@ -5,7 +5,7 @@ class pulp::config {
   file { "/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"]];
   }
 
   exec {"migrate_pulp_db":
-- 
1.7.4.4

Yes, this probably requires puppet 2.6, so we might need

diff --git a/puppet/katello-configure.spec b/puppet/katello-configure.spec
index 24cbda9..c93af55 100644
--- a/puppet/katello-configure.spec
+++ b/puppet/katello-configure.spec
@@ -12,7 +12,7 @@ URL:            http://www.katello.org
 Source0:        %{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       puppet
+Requires:       puppet >= 2.6
 
 BuildArch: noarch
 
as well.

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