opendev/system-config
Code Issues Proposed changes

Fix errors found on dashboard for jenkins.

Browse Source 
Change-Id: Iec0e8e45291786746866b066e4cc6dfcdfd4de8b
This commit is contained in:
Monty Taylor 2012-07-23 19:32:21 -05:00
parent af498777ab
commit 15493f562e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openstack_project/manifests/jenkins.pp
View File

@ -1,4 +1,6 @@
class openstack_project::jenkins { class openstack_project::jenkins {
include openstack_project::zuul_config
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 4155] iptables_public_tcp_ports => [80, 443, 4155]
} }
@ -16,5 +18,8 @@ class openstack_project::jenkins {
password => hiera('jenkins_jobs_password'), password => hiera('jenkins_jobs_password'),
site => "openstack", site => "openstack",
} }
class { "openstack_project::zuul_config": } file { "/etc/default/jenkins":
ensure => 'present',
source => 'puppet:///modules/openstack_project/jenkins/jenkins.default'
}
} }

10
modules/openstack_project/manifests/zuul_config.pp
View File

@ -2,18 +2,14 @@ class openstack_project::zuul_config {
file { "/etc/zuul/layout.yaml": file { "/etc/zuul/layout.yaml":
ensure => 'present', ensure => 'present',
source => 'puppet:///modules/openstack_ci/zuul/layout.yaml' source => 'puppet:///modules/openstack_project/zuul/layout.yaml'
} }
file { "/etc/zuul/openstack_functions.py": file { "/etc/zuul/openstack_functions.py":
ensure => 'present', ensure => 'present',
source => 'puppet:///modules/openstack_ci/zuul/openstack_functions.py' source => 'puppet:///modules/openstack_project/zuul/openstack_functions.py'
} }
file { "/etc/zuul/logging.conf": file { "/etc/zuul/logging.conf":
ensure => 'present', ensure => 'present',
source => 'puppet:///modules/openstack_ci/zuul/logging.conf' source => 'puppet:///modules/openstack_project/zuul/logging.conf'
}
file { "/etc/default/jenkins":
ensure => 'present',
source => 'puppet:///modules/openstack_ci/jenkins/jenkins.default'
} }
} }