opendev/system-config
Code Issues Proposed changes

Merge "Move automatic_upgrades management to o_p::server"

Browse Source
This commit is contained in:
Jenkins 2017-04-12 05:07:34 +00:00 committed by Gerrit Code Review
commit 3ff96003a8
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 include snmpd
class { 'openstack_project::template': 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 # This class configures single use Jenkins slaves with a few
# toggleable options. Most importantly sudo rights for the Jenkins # toggleable options. Most importantly sudo rights for the Jenkins
# user are by default off but can be enabled. Also, automatic_upgrades # user are by default off but can be enabled.
# are off by default as the assumption is the backing image for
# this single use slaves will be refreshed with new packages
# periodically.
class openstack_project::single_use_slave ( class openstack_project::single_use_slave (
$certname = $::fqdn, $certname = $::fqdn,
$install_users = true, $install_users = true,
$install_resolv_conf = true, $install_resolv_conf = true,
$sudo = false, $sudo = false,
$thin = true, $thin = true,
$automatic_upgrades = false,
$all_mysql_privs = false, $all_mysql_privs = false,
$ssh_key = $openstack_project::jenkins_ssh_key, $ssh_key = $openstack_project::jenkins_ssh_key,
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
@ -21,7 +17,6 @@ class openstack_project::single_use_slave (
) inherits openstack_project { ) inherits openstack_project {
class { 'openstack_project::template': class { 'openstack_project::template':
certname => $certname, certname => $certname,
automatic_upgrades => $automatic_upgrades,
install_users => $install_users, install_users => $install_users,
install_resolv_conf => $install_resolv_conf, install_resolv_conf => $install_resolv_conf,
permit_root_login => 'yes', permit_root_login => 'yes',

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

@ -12,7 +12,6 @@ class openstack_project::template (
$pin_puppet = '3.', $pin_puppet = '3.',
$install_users = true, $install_users = true,
$install_resolv_conf = true, $install_resolv_conf = true,
$automatic_upgrades = true,
$certname = $::fqdn, $certname = $::fqdn,
$ca_server = undef, $ca_server = undef,
$afs = false, $afs = false,
@ -67,15 +66,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': class {'openstack_project::users_install':
install_users => $install_users install_users => $install_users
} }