Merge pull request #14 from jordiprats/master

3.8 support via versioncmp($::puppetversion, '4.0.0')

.travis.yml

@@ -38,3 +38,8 @@ matrix:
     dist: trusty
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
+  - rvm: default
+    env: BEAKER_set="ubuntu16-docker"
+    dist: trusty
+    bundler_args:
+    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.6
+
+* Updated validate_* functions to validate_legacy - thanks to [jtreminio](https://github.com/jtreminio) for this [PR-13](https://github.com/NTTCom-MS/eyp-redis/pull/13)
+
 ## 0.1.5
 
 * bugfix **redis::instance** service notifications with **daemonize** set to false

manifests/service.pp

@@ -4,10 +4,20 @@
     path => '/usr/sbin:/usr/bin:/sbin:/bin',
   }
 
-  validate_legacy(Boolean, 'validate_bool', $redis::manage_docker_service)
-  validate_legacy(Boolean, 'validate_bool', $redis::manage_service)
-  validate_legacy(Boolean, 'validate_bool', $redis::service_enable)
-  validate_legacy('Optional[String]', 'validate_re', $redis::service_ensure, [ '^running$', '^stopped$' ])
+  if versioncmp($::puppetversion, '4.0.0') >= 0
+  {
+    validate_legacy(Boolean, 'validate_bool', $redis::manage_docker_service)
+    validate_legacy(Boolean, 'validate_bool', $redis::manage_service)
+    validate_legacy(Boolean, 'validate_bool', $redis::service_enable)
+    validate_legacy('Optional[String]', 'validate_re', $redis::service_ensure, [ '^running$', '^stopped$' ])
+  }
+  else
+  {
+    validate_bool($redis::manage_docker_service)
+    validate_bool($redis::manage_service)
+    validate_bool($redis::service_enable)
+    validate_re($redis::service_ensure, [ '^running$', '^stopped$' ], "Not a valid daemon status: ${redis::service_ensure}")
+  }
 
   $is_docker_container_var=getvar('::eyp_docker_iscontainer')
   $is_docker_container=str2bool($is_docker_container_var)

metadata.json

@@ -1,14 +1,14 @@
 {
   "name": "eyp-redis",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "author": "eyp",
   "summary": "multi instance redis",
   "license": "Apache-2.0",
   "source": "https://github.com/NTTCom-MS/eyp-redis",
   "project_page": "https://github.com/NTTCom-MS/eyp-redis",
   "issues_url": "https://github.com/NTTCom-MS/eyp-redis/issues",
   "dependencies": [
-    {"name":"puppetlabs/stdlib", "version_requirement":">= 4.13.0 < 9.9.9"},
+    {"name":"puppetlabs/stdlib", "version_requirement":">= 1.0.0 < 9.9.9"},
     {"name":"eyp/systemd", "version_requirement":">= 0.1.7 < 0.2.0"},
     {"name":"eyp/eyplib", "version_requirement":">= 0.1.0 < 0.2.0"}
   ],
@@ -41,7 +41,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.0.0"
+      "version_requirement": ">= 3.8.0"
     }
   ]
 }

spec/acceptance/base_spec.rb

@@ -24,5 +24,14 @@ class { 'redis': }
       it { is_expected.to be_listening }
     end
 
+    it "puppet --version" do
+      expect(shell("puppet --version").exit_code).to be_zero
+    end
+
+    describe file("/etc/redis/redis-6666.conf") do
+      it { should be_file }
+      its(:content) { should match '# puppet managed file' }
+    end
+
   end
 end

spec/acceptance/nodesets/ubuntu16-docker.yml

@@ -0,0 +1,15 @@
+HOSTS:
+  ubuntu-1604-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-16.04-amd64
+    hypervisor : docker
+    image: ubuntu:16.04
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+    docker_image_commands:
+      - 'apt-get install gcc make tar wget -y'
+CONFIG:
+  type: foss
+  log_level: debug