bump default gluster version 3.8->3.12

3.8 is EOL, 3.12 is the latest available version
voxpupuli · Mar 25, 2018 · cdfef59 · cdfef59
1 parent cefad37
commit cdfef59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/manifests/params.pp b/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

diff --git a/manifests/repo/apt.pp b/manifests/repo/apt.pp
@@ -41,7 +41,7 @@
 
  # 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',
+ '3.8'  => 'A4703C37D3F4DE7F1819E980FE79BB52D5DC52DC',
  '3.10' => 'C784DD0FD61E38B8B1F65E10DAD761554A72C1DF',
  '3.11' => 'DE82F0BACC4DB70DBEF95CA65EC2255642304A6E',
  '3.12' => '8B7C364430B66F0B084C0B0C55339A4C6A7BD8D4',
@@ -50,9 +50,8 @@
 
  # 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|3.10|3.11|3.12)$/ => "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

diff --git a/spec/classes/repo_apt_spec.rb b/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