Split out tmp clean and auto upgrades.
Create abstractions for tmpcleanup and automatic_upgrades which can be used to install/include distro specific modules modules for these features. On Ubuntu this will still install unattended_upgrades and tmpreaper. On RHEL we need to implement similar functionality and modules. Change-Id: I9209610582e23c86dccb5e70691bb598dad36950 Reviewed-on: https://review.openstack.org/23197 Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
3aa5507f58
commit
36aefd0c48
12
modules/openstack_project/manifests/automatic_upgrades.pp
Normal file
12
modules/openstack_project/manifests/automatic_upgrades.pp
Normal file
@ -0,0 +1,12 @@
|
||||
# == Class: openstack_project::automatic_upgrades
|
||||
#
|
||||
class openstack_project::automatic_upgrades (
|
||||
) {
|
||||
|
||||
if $::operatingsystem == 'Ubuntu' {
|
||||
include unattended_upgrades
|
||||
}
|
||||
|
||||
#FIXME need to implement an automatic upgrades module for RHEL
|
||||
|
||||
}
|
@ -3,8 +3,8 @@
|
||||
class openstack_project::pypi (
|
||||
$sysadmins = []
|
||||
) {
|
||||
include tmpreaper
|
||||
include unattended_upgrades
|
||||
include openstack_project::tmpcleanup
|
||||
include openstack_project::automatic_upgrades
|
||||
|
||||
# include jenkins slave so that build deps are there for the pip download
|
||||
class { 'jenkins::slave':
|
||||
|
@ -6,8 +6,8 @@ class openstack_project::slave (
|
||||
$sysadmins = []
|
||||
) {
|
||||
include openstack_project
|
||||
include tmpreaper
|
||||
include unattended_upgrades
|
||||
include openstack_project::tmpcleanup
|
||||
include openstack_project::automatic_upgrades
|
||||
class { 'openstack_project::server':
|
||||
iptables_public_tcp_ports => [],
|
||||
certname => $certname,
|
||||
|
@ -11,7 +11,7 @@ class openstack_project::template (
|
||||
) {
|
||||
include ssh
|
||||
include snmpd
|
||||
include unattended_upgrades
|
||||
include openstack_project::automatic_upgrades
|
||||
|
||||
class { 'iptables':
|
||||
public_tcp_ports => $iptables_public_tcp_ports,
|
||||
|
13
modules/openstack_project/manifests/tmpcleanup.pp
Normal file
13
modules/openstack_project/manifests/tmpcleanup.pp
Normal file
@ -0,0 +1,13 @@
|
||||
# == Class: openstack_project::tmpcleanup
|
||||
#
|
||||
class openstack_project::tmpcleanup (
|
||||
) {
|
||||
|
||||
if $::operatingsystem == 'Ubuntu' {
|
||||
include tmpreaper
|
||||
}
|
||||
|
||||
# FIXME need to implement an something on RHEL to fine tune the
|
||||
# temp directory cleanup.
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user