From 8ebf38cd2933b9b553a2ca106a42118882e4acb2 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 12 Sep 2014 12:00:56 -0700 Subject: [PATCH] Allow puppet to be automatically upgraded Since the puppet 3 release puppet versions are semver and we should be able to rely on minor version releases not breaking the world. To get security updates and the like allow puppet to be automatically upgraded. Do this by setting an additional origin for the puppetlabs apt repo in our unattended upgrades template. Change-Id: I6224ef68aeb891431661f3afc553c4c3433e583a --- modules/openstack_project/manifests/slave.pp | 1 - modules/openstack_project/manifests/template.pp | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/slave.pp b/modules/openstack_project/manifests/slave.pp index 6f7eccad57..57b6bc43ae 100644 --- a/modules/openstack_project/manifests/slave.pp +++ b/modules/openstack_project/manifests/slave.pp @@ -10,7 +10,6 @@ class openstack_project::slave ( ) { include openstack_project - include openstack_project::automatic_upgrades include openstack_project::tmpcleanup class { 'openstack_project::server': diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index 9c32acc4a5..7bb597c579 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -18,7 +18,9 @@ class openstack_project::template ( include ssh include snmpd if $automatic_upgrades == true { - include openstack_project::automatic_upgrades + class { 'openstack_project::automatic_upgrades': + origins => "Puppetlabs:${lsbdistcodename}", + } } class { 'iptables':