summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/dist_upgrade.pp3
-rw-r--r--puppet/modules/site_apt/manifests/init.pp2
-rw-r--r--puppet/modules/site_config/manifests/init.pp5
3 files changed, 8 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";';
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
index ef4ffbd3..69ff2523 100644
--- a/puppet/modules/site_config/manifests/init.pp
+++ b/puppet/modules/site_config/manifests/init.pp
@@ -6,6 +6,7 @@ class site_config {
# configure apt
include site_apt
+
# configure ssh and include ssh-keys
include site_config::sshd
@@ -20,4 +21,8 @@ class site_config {
class { 'site_config::hosts':
stage => initial,
}
+
+ class { 'site_apt::dist_upgrade':
+ stage => initial,
+ }
}