Remove puppetlabs and backports repos for buster

ocf · Aug 4, 2018 · ac1ae4c · ac1ae4c
1 parent a537d38
commit ac1ae4c
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/modules/ocf/manifests/apt.pp b/modules/ocf/manifests/apt.pp
@@ -54,18 +54,20 @@
         };
     }
 
-    # TODO: Submit patch to puppetlabs-apt to enable having includes for
-    # apt::backports (so that we can include the source too)
-    class { 'apt::backports':
-      location => 'http://mirrors/debian/';
-    }
-
     # Pin anything coming from *-backports to be lower than normal priority
     apt::pin { 'ocf-backports':
       priority => 200,
       codename => "${::lsbdistcodename}-backports",
     }
 
+    if $::lsbdistcodename != 'buster' {
+      # TODO: Submit patch to puppetlabs-apt to enable having includes for
+      # apt::backports (so that we can include the source too)
+      class { 'apt::backports':
+        location => 'http://mirrors/debian/';
+      }
+    }
+
   } elsif $::lsbdistid == 'Raspbian' {
     apt::source {
       'raspbian':
@@ -94,25 +96,23 @@
     }
   }
 
-  $puppetlabs_repo = $::lsbdistcodename ? {
-    'jessie'        => 'PC1',
-    /(sid|stretch)/ => 'puppet',
-  }
-
-  apt::source {
-    'puppetlabs':
-      location => 'http://mirrors/puppetlabs/apt/',
-      release  => $::lsbdistcodename,
-      repos    => $puppetlabs_repo,
-      include  => {
-        src => true
-      };
-  }
+  # TODO: Add the puppetlabs repo to buster when it is available
+  if $::lsbdistcodename in ['jessie', 'stretch'] {
+    apt::source {
+      'puppetlabs':
+        location => 'http://mirrors/puppetlabs/apt/',
+        release  => $::lsbdistcodename,
+        repos    => 'PC1',
+        include  => {
+          src => true
+        };
+    }
 
-  # Add the puppetlabs apt repo key
-  apt::key { 'puppet gpg key':
-    id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
-    source => 'https://mirrors.ocf.berkeley.edu/puppetlabs/apt/pubkey.gpg';
+    # Add the puppetlabs apt repo key
+    apt::key { 'puppet gpg key':
+      id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
+      source => 'https://mirrors.ocf.berkeley.edu/puppetlabs/apt/pubkey.gpg';
+    }
   }
 
   apt::key { 'ocf':