opendev/system-config
Code Issues Proposed changes

Move automatic_upgrades management to o_p::server

Browse Source 
single_use_slave turns this off so there is no reason to keep it in the
openstack_project::template class.

This patch also removes the automatic_upgrades parameter from the
single_use_slave class, which is safe because project-config does not
use it.

Change-Id: If4d425cb581f4c5f57fbcdd7eee0622e829cb7ec
This commit is contained in:
Colleen Murphy 2017-04-08 20:47:08 +02:00
parent db6c0b902b
commit 3f28416af6
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/server.pp
View File

@ -89,6 +89,10 @@ class openstack_project::server (
}
}
class { 'openstack_project::automatic_upgrades':
origins => ["Puppetlabs:${lsbdistcodename}"],
}
include snmpd
class { 'openstack_project::template':

7
modules/openstack_project/manifests/single_use_slave.pp
View File

@ -2,17 +2,13 @@
#
# This class configures single use Jenkins slaves with a few
# toggleable options. Most importantly sudo rights for the Jenkins
# user are by default off but can be enabled. Also, automatic_upgrades
# are off by default as the assumption is the backing image for
# this single use slaves will be refreshed with new packages
# periodically.
# user are by default off but can be enabled.
class openstack_project::single_use_slave (
$certname = $::fqdn,
$install_users = true,
$install_resolv_conf = true,
$sudo = false,
$thin = true,
$automatic_upgrades = false,
$all_mysql_privs = false,
$ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins',
@ -21,7 +17,6 @@ class openstack_project::single_use_slave (
) inherits openstack_project {
class { 'openstack_project::template':
certname => $certname,
automatic_upgrades => $automatic_upgrades,
install_users => $install_users,
install_resolv_conf => $install_resolv_conf,
permit_root_login => 'yes',

10
modules/openstack_project/manifests/template.pp
View File

@ -12,7 +12,6 @@ class openstack_project::template (
$pin_puppet = '3.',
$install_users = true,
$install_resolv_conf = true,
$automatic_upgrades = true,
$certname = $::fqdn,
$ca_server = undef,
$afs = false,
@ -68,15 +67,6 @@ class openstack_project::template (
}
###########################################################
# Process if ( $high_level_directive ) blocks
if $automatic_upgrades == true {
class { 'openstack_project::automatic_upgrades':
origins => ["Puppetlabs:${lsbdistcodename}"],
}
}
class {'openstack_project::users_install':
install_users => $install_users
}