Merge pull request #16 from jordiprats/master

lint
NTTCom-MS · May 11, 2018 · 30c60f6 · 30c60f6
2 parents 97b549a + 2b8ddd4
commit 30c60f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/examples/redis.pp b/examples/redis.pp
@@ -0,0 +1,3 @@
+class { 'redis': }
+
+redis::instance { '4444': }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,11 +1,11 @@
-class redis(
-                            $manage_package        = true,
-                            $package_ensure        = 'installed',
-                            $manage_service        = true,
-                            $manage_docker_service = true,
-                            $service_ensure        = 'stopped',
-                            $service_enable        = false,
-                          ) inherits redis::params{
+class redis (
+              $manage_package        = true,
+              $package_ensure        = 'installed',
+              $manage_service        = true,
+              $manage_docker_service = true,
+              $service_ensure        = 'stopped',
+              $service_enable        = false,
+            ) inherits redis::params{
 
   class { '::redis::install': } ->
   class { '::redis::service': } ->

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,7 +1,3 @@
-# == Class: redis
-#
-# === redis::install documentation
-#
 class redis::install inherits redis {
 
   file { '/etc/redis':
@@ -13,14 +9,16 @@
 
   if($redis::params::os_flavor=='RH')
   {
-    include ::epel
+    if($redis::manage_package)
+    {
+      include ::epel
 
-    Package['epel-release'] -> Package[$redis::params::package_name]
+      Class['::epel'] -> Package[$redis::params::package_name]
+    }
   }
 
   if($redis::manage_package)
   {
-    # package here, for example:
     package { $redis::params::package_name:
       ensure => $redis::package_ensure,
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		class { 'redis': }

		redis::instance { '4444': }