From 915c4d53b43864110bf91c68111bdc240d051dff Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 5 Oct 2012 14:58:45 -0700
Subject: [PATCH] Fix dependency cycle in cert file ordering.

The new cert file resources in jenkins::master introduced a dependency
cycle. Break that cycle by putting the files in place before the apache
vhost is created.

Change-Id: I0f029dd2d4fa1f5c6e168bbb479b359acb21489e
Reviewed-on: https://review.openstack.org/14115
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/jenkins/manifests/master.pp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/jenkins/manifests/master.pp b/modules/jenkins/manifests/master.pp
index 742949fada..6d486e50fb 100644
--- a/modules/jenkins/manifests/master.pp
+++ b/modules/jenkins/manifests/master.pp
@@ -51,7 +51,6 @@ class jenkins::master(
       group   => 'root',
       mode    => '0640',
       content => $ssl_cert_file_contents,
-      require => Class[apache],
       before  => Apache::Vhost[$vhost_name],
     }
   }
@@ -62,7 +61,6 @@ class jenkins::master(
       group   => 'root',
       mode    => '0640',
       content => $ssl_key_file_contents,
-      require => Class[apache],
       before  => Apache::Vhost[$vhost_name],
     }
   }
@@ -73,7 +71,6 @@ class jenkins::master(
       group   => 'root',
       mode    => '0640',
       content => $ssl_chain_file_contents,
-      require => Class[apache],
       before  => Apache::Vhost[$vhost_name],
     }
   }