From 6068c983b2f09bfc47b79fc6b527a91178e4041e Mon Sep 17 00:00:00 2001 From: Ramy Asselin Date: Mon, 18 Jul 2016 04:49:27 -0700 Subject: [PATCH] Remove ensure absent jenkins restarts Now that the jenkins restarts are 'absent' on the puppetmaster, remove them from the manifest. Change-Id: Iffa6981fed577ddc50ac30d887903fcca85c3adf --- .../manifests/puppetmaster.pp | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 2e80f96cc6..bb29d78d8c 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -215,35 +215,6 @@ class openstack_project::puppetmaster ( } } -# Jenkins master management - cron { 'restartjenkinsmasters': - ensure => absent, - # Run through all masters onces a week. - weekday => '6', - hour => '0', - minute => '15', - environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', - command => "flock -n /var/run/puppet/restart_jenkins_masters.lock ansible-playbook -f 1 /opt/system-config/production/playbooks/restart_jenkins_masters.yaml --extra-vars 'user=${jenkins_api_user} password=${jenkins_api_key}' >> /var/log/restart_jenkins_masters.log 2>&1", - } - - file { '/var/log/restart_jenkins_masters.log': - ensure => absent, - } - - logrotate::file { 'restartjenkinsmasters': - ensure => absent, - log => '/var/log/restart_jenkins_masters.log', - options => ['compress', - 'copytruncate', - 'delaycompress', - 'missingok', - 'rotate 7', - 'daily', - 'notifempty', - ], - require => Cron['restartjenkinsmasters'], - } - # Ansible mgmt # TODO: Put this into its own class, maybe called bastion::ansible or something