opendev/system-config
Code Issues Proposed changes

Fix dependency cycle in cert file ordering.

Browse Source 
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
This commit is contained in:
Clark Boylan 2012-10-05 14:58:45 -07:00 committed by Jenkins
parent 82a18132f0
commit 915c4d53b4
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/jenkins/manifests/master.pp
View File

@ -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],
}
}