diff options
| author | varac <varacanero@zeromail.org> | 2012-12-19 10:56:06 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-12-19 10:56:06 +0100 |
| commit | e97a022b52291a2593ee0efbab4c1b8f9d60be01 (patch) | |
| tree | 6e9750da5f3ff8d3856af92199f53a5470bbc638 /puppet/modules/site_apt/manifests | |
| parent | 9115e761133cd06e369a22cc357ba718f1fa6020 (diff) | |
move apt-get upgrade to inital stage
Diffstat (limited to 'puppet/modules/site_apt/manifests')
| -rw-r--r-- | puppet/modules/site_apt/manifests/dist_upgrade.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/init.pp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 5ae9297f..4baabc77 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -6,5 +6,6 @@ class site_apt::dist_upgrade inherits apt::dist_upgrade { } # Ensure apt-get upgrade has been run before installing any packages - Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> + # Disables because apt-get update is moved to stage initial + # Exec["apt_dist-upgrade"] -> Package <| name != 'lsb-release' |> } diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 631f5742..99bcce4f 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,7 +1,7 @@ class site_apt { include ::apt - include site_apt::dist_upgrade + #include site_apt::dist_upgrade apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; |