opendev/system-config
Code Issues Proposed changes

Merge "Remove update_slave from puppetmaster"

Browse Source
This commit is contained in:
Jenkins 2014-09-11 21:44:32 +00:00 committed by Gerrit Code Review
commit 814adfc6a2
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -183,7 +183,6 @@ node 'ci-puppetmaster.openstack.org' {
node 'puppetmaster.openstack.org' { node 'puppetmaster.openstack.org' {
class { 'openstack_project::puppetmaster': class { 'openstack_project::puppetmaster':
root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'), root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
update_slave => false,
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
version => '3.6.', version => '3.6.',
} }

20
modules/openstack_project/manifests/puppetmaster.pp
View File

@ -2,7 +2,6 @@
# #
class openstack_project::puppetmaster ( class openstack_project::puppetmaster (
$root_rsa_key, $root_rsa_key,
$update_slave = true,
$sysadmins = [], $sysadmins = [],
$version = '2.7.', $version = '2.7.',
$ca_server = undef, $ca_server = undef,
@ -38,8 +37,13 @@ class openstack_project::puppetmaster (
require => Class['ansible'], require => Class['ansible'],
} }
if ($update_slave) { cron { 'updatepuppetmaster':
$cron_command = 'bash /opt/config/production/run_all.sh' user => 'root',
minute => '*/15',
command => 'bash /opt/config/production/run_all.sh',
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
}
logrotate::file { 'updatepuppetmaster': logrotate::file { 'updatepuppetmaster':
ensure => present, ensure => present,
log => '/var/log/puppet_run_all.log', log => '/var/log/puppet_run_all.log',
@ -53,16 +57,6 @@ class openstack_project::puppetmaster (
], ],
require => Cron['updatepuppetmaster'], require => Cron['updatepuppetmaster'],
} }
} else {
$cron_command = 'sleep $((RANDOM\%600)) && cd /opt/config/production && git fetch -q && git reset -q --hard @{u} && ./install_modules.sh && touch manifests/site.pp'
}
cron { 'updatepuppetmaster':
user => 'root',
minute => '*/15',
command => $cron_command,
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
}
cron { 'deleteoldreports': cron { 'deleteoldreports':
user => 'root', user => 'root',