diff options
| author | varac <varacanero@zeromail.org> | 2016-02-01 13:24:53 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-02-02 19:38:35 +0100 |
| commit | 5d4642e94c8a1a460988fe11419556753ce0f1aa (patch) | |
| tree | 83a6f3c3fa1c137e1f9a7390664d36b151fdc8eb | |
| parent | 2211934991158ea66b8d64ac8de4fb8b971f736e (diff) | |
[refactor] Remove atomic apt package dependecy
`site_config::default.pp` takes care the all packages are
installed before `Exec['refresh_apt']`, so we don't need to
add it here for a single package.
| -rw-r--r-- | puppet/modules/site_apt/manifests/leap_repo.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/setup.pp | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp index a1382374..60948d91 100644 --- a/puppet/modules/site_apt/manifests/leap_repo.pp +++ b/puppet/modules/site_apt/manifests/leap_repo.pp @@ -13,7 +13,4 @@ class site_apt::leap_repo { ensure => latest } - # We wont be able to install the leap-keyring package unless the leap apt - # source has been added and apt has been refreshed - Exec['refresh_apt'] -> Package['leap-keyring'] } diff --git a/puppet/modules/site_config/manifests/setup.pp b/puppet/modules/site_config/manifests/setup.pp index dba5fa14..82dfe76d 100644 --- a/puppet/modules/site_config/manifests/setup.pp +++ b/puppet/modules/site_config/manifests/setup.pp @@ -24,8 +24,7 @@ class site_config::setup { include site_apt package { 'facter': - ensure => latest, - require => Exec['refresh_apt'] + ensure => latest } # if squid_deb_proxy_client is set to true, install and configure |