CHANGED: got rid of historical cf-apt-update workaround

andvgal · andvgal · commit c9e5bdee67a0 · 2019-04-14T00:41:27.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,9 @@ project adheres to [Semantic Versioning](http://semver.org/).
 - FIXED: forced secrets to override persistent values
 - FIXED: atomicWrite to obey ownership & mode when content is the same
 - FIXED: cfsystem_timer exceptions in some configurations
-- CHANED: to prune /opt/codingfuture/bin
+- CHANGED: to prune /opt/codingfuture/bin
 - CHANGED: Ubuntu instance to remove update-motd package
+- CHANGED: got rid of historical cf-apt-update workaround
 - NEW: 'silent' atomic file write API for temporary cases
 
 ## 1.2.0 (2018-12-09)
diff --git a/manifests/apt/common.pp b/manifests/apt/common.pp
@@ -29,17 +29,8 @@
         }
     }
 
-    stage { 'cf-apt-setup':
-        require => Stage['setup'],
-        before  => Stage['main'],
-    }
-
-    class { 'cfsystem::apt::update':
-        stage => 'cf-apt-setup',
-    }
-
     class { 'cfsystem::apt::puppetlabs':
         release => $puppet_release,
-        stage   => 'cf-apt-setup',
+        stage   => 'setup',
     }
 }
diff --git a/manifests/apt/puppetlabs.pp b/manifests/apt/puppetlabs.pp
@@ -8,8 +8,7 @@
 ) {
     assert_private()
 
-    Exec['cf-apt-update']
-    -> package { 'puppetlabs-release': ensure => absent }
+    package { 'puppetlabs-release': ensure => absent }
     -> package { 'puppetlabs-release-pc1': ensure => absent }
     -> package { 'puppet5-release': ensure => latest }
     # ->
@@ -18,11 +17,9 @@
     #}
 
     apt::source { 'puppet5':
-        location      => 'http://apt.puppetlabs.com',
-        release       => $release,
-        repos         => 'puppet5',
-        pin           => $cfsystem::apt_pin + 1,
-        notify_update => false,
-        notify        => Exec['cf-apt-update'],
+        location => 'http://apt.puppetlabs.com',
+        release  => $release,
+        repos    => 'puppet5',
+        pin      => $cfsystem::apt_pin + 1,
     }
 }
diff --git a/manifests/apt/update.pp b/manifests/apt/update.pp
diff --git a/manifests/debian/aptconfig.pp b/manifests/debian/aptconfig.pp
@@ -5,6 +5,14 @@
 
 # Please see README
 class cfsystem::debian::aptconfig {
+    # Required by stretch/xenial
+    user { '_apt':
+        ensure => present,
+        home   => '/nonexistent',
+        shell  => '/bin/false',
+        gid    => 'nogroup',
+    }
+
     # Use for temporary mapping with new releases
     #---
     if versioncmp($::facts['operatingsystemrelease'], '10') >= 0 {
diff --git a/manifests/debian/cache.pp b/manifests/debian/cache.pp
@@ -7,14 +7,6 @@
 class cfsystem::debian::cache(
     $acng_patterns = {},
 ) {
-    # Required by stretch/xenial
-    user { '_apt':
-        ensure => present,
-        home   => '/nonexistent',
-        shell  => '/bin/false',
-        gid    => 'nogroup',
-    }
-
     if $::cfsystem::add_repo_cacher {
         $acng_patterns_def = {
             'P' => [],

Original file line number	Diff line number	Diff line change
`@@ -29,17 +29,8 @@`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- stage { 'cf-apt-setup':`
`33`		`- require => Stage['setup'],`
`34`		`- before => Stage['main'],`
`35`		`- }`
`36`		`-`
`37`		`- class { 'cfsystem::apt::update':`
`38`		`- stage => 'cf-apt-setup',`
`39`		`- }`
`40`		`-`
`41`	`32`	`class { 'cfsystem::apt::puppetlabs':`
`42`	`33`	`release => $puppet_release,`
`43`		`- stage => 'cf-apt-setup',`
	`34`	`+ stage => 'setup',`
`44`	`35`	`}`
`45`	`36`	`}`