Merge pull request #139 from bastelfreak/debian9

Add support for Debian 9, drop debian 8

Author: llowder

.sync.yml

@@ -2,4 +2,5 @@
 .travis.yml:
   docker_sets:
     - set: docker/centos-7
+    - set: docker/debian-9
   secure: "l2HEhssQyDQGrdBkGS8f/gQ4FA5vVLM0JegyAVaaIXpRrJYgRiDAvC+u81HS//+J0v9cr4jo74ncl1HGU0QJZURJX/L8DJqUVXzSZpe9HmfrQpV1RDUSNMqzaIq5Z268Ou9n1Jkeg58WJyIaks9PQhXoWRRSnaCyDHrbGM8XcAU="

.travis.yml

@@ -31,6 +31,12 @@ matrix:
     env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
     services: docker
     sudo: required
+  - rvm: 2.4.3
+    bundler_args: --without development release
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-9 CHECK=beaker
+    services: docker
+    sudo: required
 branches:
   only:
   - master

manifests/params.pp

@@ -55,7 +55,7 @@
       $repo           = true
       $server_package = 'glusterfs-server'
       $client_package = 'glusterfs-client'
-      $service_name   = 'glusterfs-server'
+      $service_name   = 'glusterd'
     }
     'Archlinux': {
       $repo = false

manifests/repo/apt.pp

@@ -50,9 +50,9 @@
 
   # Key location is different for some releases
   $repo_key_source = $release ? {
-  '3.8'   => "https://download.gluster.org/pub/gluster/glusterfs/${release}/LATEST/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' {

metadata.json

@@ -23,7 +23,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9"
       ]
     },

spec/classes/service_spec.rb

@@ -14,7 +14,7 @@
           when 'Redhat'
             is_expected.to create_service('glusterd')
           when 'Debian'
-            is_expected.to create_service('glusterfs-server')
+            is_expected.to create_service('glusterd')
           when 'Archlinux'
             is_expected.to create_service('glusterd')
           end

spec/spec_helper_acceptance.rb

@@ -1,29 +1,17 @@
-require 'puppet'
 require 'beaker-rspec'
-require 'yaml'
+require 'beaker/puppet_install_helper'
+require 'beaker/module_install_helper'
 
-install_puppet_agent_on hosts, {}
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
+install_module
+install_module_dependencies
 
 RSpec.configure do |c|
-  # Project root
-  module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  module_name = module_root.split('-').last
-
   # Readable test descriptions
   c.formatter = :documentation
-
-  c.before :suite do
-    # Install module and dependencies
-    puppet_module_install(source: module_root, module_name: module_name)
-
-    modules_fixtures = YAML.load_file(module_root + '/.fixtures.yml')
-    modules = modules_fixtures['fixtures']['repositories']
-
-    hosts.each do |host|
-      modules.each do |_name, mod_url|
-        mod_name = mod_url.split('/').last.sub('.git', '')
-        on host, puppet('module', 'install', mod_name), acceptable_exit_codes: [0, 1]
-      end
+  hosts.each do |host|
+    if host[:platform] =~ %r{el-7-x86_64} && host[:hypervisor] =~ %r{docker}
+      on(host, "sed -i '/nodocs/d' /etc/yum.conf")
     end
   end
 end