Merge branch '7844_fix_deploy_on_plain_node' into develop

4 files changed, 3 insertions, 15 deletions

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 96f06e6c..256de1a1 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -7,18 +7,6 @@ class site_config::default {
   include site_config::params
   include site_config::setup
 
-  # By default, the class 'site_config::slow' is included in site.pp.
-  # It basically does an 'apt-get update' and 'apt-get dist-upgrade'.
-  # This class can be excluded by using 'leap deploy --fast',
-  # see https://leap.se/en/docs/platform/details/under-the-hood#tags for more
-  # details.
-  # The following Package resource override makes sure that *if* an
-  # 'apt-get update' is executed by 'site_config::slow', it should be done
-  # before any packages are installed.
-
-  Package { require => Exec['refresh_apt'] }
-
-
   # default class, used by all hosts
 
   include lsb, git
diff --git a/puppet/modules/site_config/manifests/remove/jessie.pp b/puppet/modules/site_config/manifests/remove/jessie.pp
index cbeaae05..c813e46d 100644
--- a/puppet/modules/site_config/manifests/remove/jessie.pp
+++ b/puppet/modules/site_config/manifests/remove/jessie.pp
@@ -3,7 +3,7 @@ class site_config::remove::jessie {
 
   tidy {
     '/etc/apt/preferences.d/rsyslog_anon_depends':
-      notify => Exec['refresh_apt'];
+      notify => Exec['apt_updated'];
   }
 
 }
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
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
index de276bc3..8e9b7035 100644
--- a/puppet/modules/site_config/manifests/slow.pp
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -4,6 +4,7 @@
 class site_config::slow {
   tag 'leap_slow'
 
+  include site_config::default
   include apt::update
   class { 'site_apt::dist_upgrade': }
 }