diff options
| author | varac <varacanero@zeromail.org> | 2016-01-19 22:40:03 +0100 | 
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-19 22:40:03 +0100 | 
| commit | 9718a6cf697ffeb79dcafbb2ce35dbdd6f43f9b4 (patch) | |
| tree | ec1640306a16174d694ba23d4f6d12a7d363834e | |
| parent | d5ecb50e4d31fde0792a77d12006a26ef33e8d3f (diff) | |
| parent | 3bb37824d5cf1e146a257d14d5cf41d7df3def5d (diff) | |
Merge branch 'remove_double_apt_get_update' into develop
| -rw-r--r-- | puppet/modules/site_apt/manifests/dist_upgrade.pp | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/puppet/modules/site_apt/manifests/dist_upgrade.pp b/puppet/modules/site_apt/manifests/dist_upgrade.pp index 08de31bb..40e2dd58 100644 --- a/puppet/modules/site_apt/manifests/dist_upgrade.pp +++ b/puppet/modules/site_apt/manifests/dist_upgrade.pp @@ -1,17 +1,17 @@ +# upgrade all packages  class site_apt::dist_upgrade { +  # facter returns 'true' as string +  # lint:ignore:quoted_booleans    if $::apt_running == 'true' { +  # lint:endignore      fail ('apt-get is running in background - Please wait until it finishes. Exiting.')    } else { -    exec{'initial_apt_update': -      command     => '/usr/bin/apt-get update', -      refreshonly => false, -      timeout     => 360, -    }      exec{'initial_apt_dist_upgrade':        command     => "/usr/bin/apt-get -q -y -o 'DPkg::Options::=--force-confold'  dist-upgrade",        refreshonly => false,        timeout     => 1200, +      require     => Exec['refresh_apt']      }    }  } | 
