From 9c1c97b2e2e5b2f361bebe991d7229d271773e24 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 12 Mar 2013 23:54:28 +0100 Subject: enable leap deb package repository and leap apt key on all hosts --- puppet/modules/site_apt/manifests/init.pp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 80c6fbde..1f8456b2 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -2,6 +2,9 @@ class site_apt { include ::apt + # enable http://deb.leap.se debian package repository + include site_apt::leap_repo + apt::apt_conf { '90disable-pdiffs': content => 'Acquire::PDiffs "false";'; } -- cgit v1.2.3 From e358ef4e33cbf9411d57c11d58657331d7ba8a62 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 14 Mar 2013 18:01:01 +0100 Subject: use custom preferences for couchdb host --- puppet/modules/site_apt/manifests/init.pp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 1f8456b2..f420b0cc 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -1,6 +1,13 @@ -class site_apt { +class site_apt { - include ::apt + # on couchdb we need to include squeeze in apt preferences, + # so the cloudant package can pull some packages from squeeze + if 'couchdb' in $::services { + $custom_preferences = 'site_apt/preferences.include_squeeze' + } else { + $custom_preferences = '' + } + class {'apt': custom_preferences => $custom_preferences } # enable http://deb.leap.se debian package repository include site_apt::leap_repo -- cgit v1.2.3 From 3a99b7085c5a6c329adb9277b71f41e0ad9478a4 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 14 Mar 2013 18:28:44 +0100 Subject: pass template() to apt --- puppet/modules/site_apt/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index f420b0cc..de854d58 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -2,8 +2,9 @@ class site_apt { # on couchdb we need to include squeeze in apt preferences, # so the cloudant package can pull some packages from squeeze + # template() must be unquoted ! if 'couchdb' in $::services { - $custom_preferences = 'site_apt/preferences.include_squeeze' + $custom_preferences = template("site_apt/preferences.include_squeeze") } else { $custom_preferences = '' } -- cgit v1.2.3 From 9f9ea1670bc319f8c5cecff0ae02b2d342615e62 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 17 Apr 2013 11:24:54 -0400 Subject: rename fallback apt source list so it will be more obvious when it is paired with the primary.list --- puppet/modules/site_apt/manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index de854d58..c5f37014 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -19,8 +19,8 @@ class site_apt { include ::apt::unattended_upgrades - apt::sources_list { 'fallback.list.disabled': - content => template('site_apt/fallback.list'); + apt::sources_list { 'secondary.list.disabled': + content => template('site_apt/secondary.list'); } } -- cgit v1.2.3 From e085e66f0f1c045b0282f738f4501e7a1d2fd301 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 20 Jun 2013 12:03:34 -0400 Subject: We need to have a newer facter installed in order to get an updated fact for piston cloud This moves the apt configuration into the setup.pp run, so we can get the backport source added early which will enable us to install the latest facter from the backports repository. Change-Id: I8ccf1a0445dea72f1b94be08484f33e648439ec1 --- puppet/modules/site_apt/manifests/init.pp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c5f37014..c33b7a84 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -23,4 +23,9 @@ class site_apt { content => template('site_apt/secondary.list'); } + apt::preferences_snippet { 'facter': + release => "${::lsbdistcodename}-backports", + priority => 999 + } + } -- cgit v1.2.3 From f2f4b3cfc2ad70e649da42ef82cca7c2e1d73096 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 24 Jun 2013 00:02:19 +0200 Subject: Install all packages after refresh_apt (Feature #2971) --- puppet/modules/site_apt/manifests/init.pp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index c33b7a84..0da7f3be 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -28,4 +28,12 @@ class site_apt { priority => 999 } + # All packages should be installed _after_ refresh_apt is called, + # which does an apt-get update. + # There is one exception: + # The creation of sources.list depends on the lsb package + + File['/etc/apt/preferences'] -> + Exec['refresh_apt'] + Package <| ( title != 'lsb' ) |> } -- cgit v1.2.3 From 4b5b54d031344aa7a7b86254c820e391a4d4d762 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 25 Jun 2013 17:05:11 -0400 Subject: update the apt submodule in order to get the fix for unattended_upgrades (#2984) and the custom_key_dir as a class parameter remove the global variable from setup.pp and site.pp and instead pass it into the apt class declaration as a parameter Change-Id: I24806f2fd22b5a066b951c5f76f3dd748481b5b6 --- puppet/modules/site_apt/manifests/init.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'puppet/modules/site_apt/manifests/init.pp') diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp index 0da7f3be..8821c110 100644 --- a/puppet/modules/site_apt/manifests/init.pp +++ b/puppet/modules/site_apt/manifests/init.pp @@ -8,7 +8,10 @@ class site_apt { } else { $custom_preferences = '' } - class {'apt': custom_preferences => $custom_preferences } + class { 'apt': + custom_preferences => $custom_preferences, + custom_key_dir => 'puppet:///modules/site_apt/keys' + } # enable http://deb.leap.se debian package repository include site_apt::leap_repo -- cgit v1.2.3