opendev/system-config
Code Issues Proposed changes

Merge "Move first few servers to puppet agent"

Browse Source
This commit is contained in:
Jenkins 2012-06-08 19:17:36 +00:00 committed by Gerrit Code Review
commit d2c4343e4b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/site.pp
View File

@ -18,6 +18,20 @@ class openstack_cron {
} }
} }
class remove_openstack_cron {
cron { "updatepuppet":
ensure => absent
}
file { '/etc/init/puppetboot.conf':
ensure => absent
}
file { "/etc/logrotate.d/updatepuppet":
ensure => absent
}
}
class openstack_jenkins_slave { class openstack_jenkins_slave {
include openstack_cron include openstack_cron
include tmpreaper include tmpreaper
@ -358,7 +372,7 @@ node "docs.openstack.org" {
} }
node "paste.openstack.org" { node "paste.openstack.org" {
include openstack_cron include remove_openstack_cron
class { 'openstack_server': class { 'openstack_server':
iptables_public_tcp_ports => [80] iptables_public_tcp_ports => [80]
} }
@ -375,7 +389,7 @@ node "paste.openstack.org" {
} }
node "planet.openstack.org" { node "planet.openstack.org" {
include openstack_cron include remove_openstack_cron
class { 'openstack_server': class { 'openstack_server':
iptables_public_tcp_ports => [80] iptables_public_tcp_ports => [80]
} }
@ -387,7 +401,7 @@ node "planet.openstack.org" {
} }
node "eavesdrop.openstack.org" { node "eavesdrop.openstack.org" {
include openstack_cron include remove_openstack_cron
class { 'openstack_server': class { 'openstack_server':
iptables_public_tcp_ports => [80] iptables_public_tcp_ports => [80]
} }