Delete the old cron-based puppet thing
Also, delete the legacy non-nodepool slave references. Change-Id: I995576ab240c6f228716fa075d3513b47c41e7c1
This commit is contained in:
parent
e8fee5ca6d
commit
c8a29bea6d
@ -73,8 +73,6 @@ The minimum set of things to port across is:
|
|||||||
|
|
||||||
* modules/openstack_project/manifests/params.pp
|
* modules/openstack_project/manifests/params.pp
|
||||||
|
|
||||||
* modules/openstack_project/manifests/puppet_cron.pp
|
|
||||||
|
|
||||||
* modules/openstack_project/manifests/server.pp
|
* modules/openstack_project/manifests/server.pp
|
||||||
|
|
||||||
* modules/openstack_project/manifests/template.pp
|
* modules/openstack_project/manifests/template.pp
|
||||||
|
@ -19,7 +19,6 @@ $elasticsearch_nodes = [
|
|||||||
# Default: should at least behave like an openstack server
|
# Default: should at least behave like an openstack server
|
||||||
#
|
#
|
||||||
node default {
|
node default {
|
||||||
include openstack_project::puppet_cron
|
|
||||||
class { 'openstack_project::server':
|
class { 'openstack_project::server':
|
||||||
sysadmins => hiera('sysadmins', ['admins']),
|
sysadmins => hiera('sysadmins', ['admins']),
|
||||||
}
|
}
|
||||||
@ -640,49 +639,6 @@ node 'pypi.slave.openstack.org' {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: precise
|
|
||||||
node /^precise-dev\d+.*\.slave\.openstack\.org$/ {
|
|
||||||
include openstack_project
|
|
||||||
include openstack_project::puppet_cron
|
|
||||||
class { 'openstack_project::slave':
|
|
||||||
ssh_key => $openstack_project::jenkins_dev_ssh_key,
|
|
||||||
sysadmins => hiera('sysadmins', ['admin']),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: precise
|
|
||||||
node /^precisepy3k-dev\d+.*\.slave\.openstack\.org$/ {
|
|
||||||
include openstack_project
|
|
||||||
include openstack_project::puppet_cron
|
|
||||||
class { 'openstack_project::slave':
|
|
||||||
ssh_key => $openstack_project::jenkins_dev_ssh_key,
|
|
||||||
sysadmins => hiera('sysadmins', ['admin']),
|
|
||||||
python3 => true,
|
|
||||||
include_pypy => true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: centos6
|
|
||||||
node /^centos6-dev\d+\.slave\.openstack\.org$/ {
|
|
||||||
include openstack_project
|
|
||||||
include openstack_project::puppet_cron
|
|
||||||
class { 'openstack_project::slave':
|
|
||||||
ssh_key => $openstack_project::jenkins_dev_ssh_key,
|
|
||||||
sysadmins => hiera('sysadmins', ['admin']),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: fedora18
|
|
||||||
node /^fedora18-dev\d+\.slave\.openstack\.org$/ {
|
|
||||||
include openstack_project
|
|
||||||
include openstack_project::puppet_cron
|
|
||||||
class { 'openstack_project::slave':
|
|
||||||
ssh_key => $openstack_project::jenkins_dev_ssh_key,
|
|
||||||
sysadmins => hiera('sysadmins', ['admin']),
|
|
||||||
python3 => true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: precise
|
# Node-OS: precise
|
||||||
node 'openstackid-dev.openstack.org' {
|
node 'openstackid-dev.openstack.org' {
|
||||||
class { 'openstack_project::openstackid_dev':
|
class { 'openstack_project::openstackid_dev':
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
# == Class: openstack_project::puppet_cron
|
|
||||||
#
|
|
||||||
class openstack_project::puppet_cron($ensure = present)
|
|
||||||
{
|
|
||||||
include logrotate
|
|
||||||
|
|
||||||
class { 'puppetboot':
|
|
||||||
ensure => $ensure,
|
|
||||||
}
|
|
||||||
cron { 'updatepuppet':
|
|
||||||
ensure => $ensure,
|
|
||||||
user => 'root',
|
|
||||||
minute => '*/15',
|
|
||||||
command => "${::openstack_project::params::update_pkg_list_cmd}sleep $((RANDOM\%600)) && puppet agent --test >>/var/log/manifest.log",
|
|
||||||
environment => 'PATH=/var/lib/gems/1.8/bin:/usr/bin:/bin:/usr/sbin:/sbin',
|
|
||||||
}
|
|
||||||
logrotate::file { 'updatepuppet':
|
|
||||||
ensure => $ensure,
|
|
||||||
log => '/var/log/manifest.log',
|
|
||||||
options => ['compress',
|
|
||||||
'delaycompress',
|
|
||||||
'missingok',
|
|
||||||
'rotate 7',
|
|
||||||
'daily',
|
|
||||||
'notifempty',
|
|
||||||
],
|
|
||||||
require => Cron['updatepuppet'],
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
author "Monty Taylor <mordred@inaugust.com>"
|
|
||||||
description "Applying puppet config on boot"
|
|
||||||
|
|
||||||
start on runlevel[2345]
|
|
||||||
|
|
||||||
script
|
|
||||||
echo "Running puppet on boot" >> /var/log/manifest.log
|
|
||||||
date >> /var/log/manifest.log
|
|
||||||
/usr/bin/puppet agent --test >> /var/log/manifest.log
|
|
||||||
end script
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
# == Class: puppetboot
|
|
||||||
#
|
|
||||||
class puppetboot($ensure=present) {
|
|
||||||
if ($::operatingsystem in ['CentOS', 'RedHat', 'Ubuntu']) {
|
|
||||||
file {'/etc/init/puppetboot.conf':
|
|
||||||
ensure => $ensure,
|
|
||||||
owner => 'root',
|
|
||||||
group => 'root',
|
|
||||||
mode => '0644',
|
|
||||||
source => 'puppet:///modules/puppetboot/puppetboot.conf',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user