Merge pull request #143 from bastelfreak/bump_gluster_version

Add support for gluster 3.10-312; Set default version 3.8->3.12

Author: bastelfreak

manifests/params.pp

@@ -24,7 +24,7 @@
   # parameters dealing with installation
   $install_server = true
   $install_client = true
-  $release        = '3.8'
+  $release        = '3.12'
   $version        = 'LATEST'
 
   # we explicitly do NOT set a priority here. The user must define

manifests/repo/apt.pp

@@ -41,16 +41,18 @@
 
   # Key has changed since 3.9
   $repo_key_name = $release ? {
-    /(3.0|3.1|3.2|3.3|3.4|3.5|3.6|3.7|3.8)/ => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
-    default                                 => '849512C2CA648EF425048F55C883F50CB2289A17',
+    '3.8'                                     => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
+    '3.10'                                    => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
+    '3.11'                                    => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
+    '3.12'                                    => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
+    default                                   => '849512C2CA648EF425048F55C883F50CB2289A17',
   }
 
   # Key location is different for some releases
   $repo_key_source = $release ? {
-    /(3.0|3.1|3.2|3.3|3.4|3.5|3.7|3.8)/  => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/rsa.pub",
-    '3.6'                                => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/Debian/rsa.pub",
-    default                              => "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub",
-  }
+  '3.8'   => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/rsa.pub",
+  default => "https://download.gluster.org/pub/gluster/glusterfs/${release}/rsa.pub",
+}
 
   # basic sanity check
   if $version == 'LATEST' {

spec/acceptance/client_spec.rb

@@ -6,10 +6,8 @@
       pp = <<-EOS
 
        class { 'gluster':
-         repo    => true,
          client  => true,
          server  => false,
-         release => '3.9',
        }
 
       EOS

spec/acceptance/server_spec.rb

@@ -6,10 +6,8 @@
       pp = <<-EOS
 
        class { 'gluster':
-         repo    => true,
          client  => false,
          server  => true,
-         release => '3.9',
        }
 
       EOS

spec/classes/repo_apt_spec.rb

@@ -19,7 +19,7 @@
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',
               release: facts[:lsbdistcodename].to_s,
-              location: "http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
+              location: "http://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
             )
           end
         end
@@ -47,7 +47,7 @@
             is_expected.to contain_apt__source('glusterfs-LATEST').with(
               repos: 'main',
               release: facts[:lsbdistcodename].to_s,
-              location: "http://download.gluster.org/pub/gluster/glusterfs/3.8/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/",
+              location: "http://download.gluster.org/pub/gluster/glusterfs/3.12/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/",
               pin: '700'
             )
           end
@@ -73,26 +73,6 @@
           end
         end
 
-        context 'Specific Gluster release 3.6' do
-          let :params do
-            {
-              release: '3.6'
-            }
-          end
-
-          it 'installs' do
-            is_expected.to contain_apt__source('glusterfs-LATEST').with(
-              repos: 'main',
-              release: facts[:lsbdistcodename].to_s,
-              key: {
-                'id' => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
-                'key_source' => 'https://download.gluster.org/pub/gluster/glusterfs/3.6/LATEST/Debian/rsa.pub'
-              },
-              location: "http://download.gluster.org/pub/gluster/glusterfs/3.6/LATEST/Debian/#{facts[:lsbdistcodename]}/apt/"
-            )
-          end
-        end
-
         context 'Specific Gluster release 3.8' do
           let :params do
             {