Merge pull request #225 from tapsboy/master

Node 6 is now available on EL6 & EL7
voxpupuli · May 11, 2016 · 4f5645c · 4f5645c
2 parents 818f81e + 25058aa
commit 4f5645c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -56,7 +56,7 @@
           validate_re($repo_url_suffix, '^0\.1[02]$', $suffix_error_msg)
         }
         elsif $::operatingsystemrelease =~ /^[67]\.(\d+)/ {
-          validate_re($repo_url_suffix, '^(0\.1[02]|[45]\.x)$', $suffix_error_msg)
+          validate_re($repo_url_suffix, '^(0\.1[02]|[456]\.x)$', $suffix_error_msg)
         }
         # Fedora
         elsif $::operatingsystem == 'Fedora' {

diff --git a/spec/classes/nodejs_spec.rb b/spec/classes/nodejs_spec.rb
@@ -1061,7 +1061,8 @@
 
   context 'when running on Windows' do
     let :facts do
-      { osfamily: 'Windows',
+      {
+        osfamily: 'Windows',
         operatingsystem: 'Windows',
       }
     end
@@ -1162,7 +1163,8 @@
 
   context 'when running on Amazon Linux 2014.09' do
     let :facts do
-      { osfamily: 'Linux',
+      {
+        osfamily: 'Linux',
         operatingsystem: 'Amazon',
         operatingsystemrelease: '2014.09',
       }
@@ -1426,7 +1428,8 @@
   end
   context 'when running on Amazon Linux 2015.03' do
     let :facts do
-      { osfamily: 'RedHat',
+      {
+        osfamily: 'RedHat',
         operatingsystem: 'Amazon',
         operatingsystemrelease: '2015.03',
       }