diff options
author | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
---|---|---|
committer | Varac <varac@leap.se> | 2017-06-27 13:57:43 +0200 |
commit | 3bed48fba6ae35813b8c4413887aba5262c43689 (patch) | |
tree | 75595f81892da069002af27f361c41ac6381cd96 /manifests/dist_upgrade/initiator.pp | |
parent | 5d001efb65f4ac2afa39d17b7b62d4f861f450a3 (diff) | |
parent | f3db3309f3a3fc5ee0f621593ed83805798f7890 (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests/dist_upgrade/initiator.pp')
-rw-r--r-- | manifests/dist_upgrade/initiator.pp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/manifests/dist_upgrade/initiator.pp b/manifests/dist_upgrade/initiator.pp index d238988..5dfce14 100644 --- a/manifests/dist_upgrade/initiator.pp +++ b/manifests/dist_upgrade/initiator.pp @@ -1,6 +1,6 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade { - $initiator = 'upgrade_initiator' + $initiator = 'upgrade_initiator' $initiator_abs = "${apt::apt_base_dir}/${initiator}" file { 'apt_upgrade_initiator': @@ -9,15 +9,12 @@ class apt::dist_upgrade::initiator inherits apt::dist_upgrade { group => 0, path => $initiator_abs, checksum => md5, - source => [ - "puppet:///modules/site_apt/${::fqdn}/${initiator}", + source => [ "puppet:///modules/site_apt/${::fqdn}/${initiator}", "puppet:///modules/site_apt/${initiator}", - "puppet:///modules/apt/${initiator}", - ], + "puppet:///modules/apt/${initiator}" ], } Exec['apt_dist-upgrade'] { subscribe +> File['apt_upgrade_initiator'], } - } |