opendev/system-config
Code Issues Proposed changes

Merge "Allow puppet to be automatically upgraded"

Browse Source
This commit is contained in:
Jenkins 2014-09-16 18:44:38 +00:00 committed by Gerrit Code Review
commit 97fbb032d5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/manifests/slave.pp
View File

@ -10,7 +10,6 @@ class openstack_project::slave (
) { ) {
include openstack_project include openstack_project
include openstack_project::automatic_upgrades
include openstack_project::tmpcleanup include openstack_project::tmpcleanup
class { 'openstack_project::server': class { 'openstack_project::server':

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

@ -18,7 +18,9 @@ class openstack_project::template (
include ssh include ssh
include snmpd include snmpd
if $automatic_upgrades == true { if $automatic_upgrades == true {
include openstack_project::automatic_upgrades class { 'openstack_project::automatic_upgrades':
origins => "Puppetlabs:${lsbdistcodename}",
}
} }
class { 'iptables': class { 'iptables':