removing unneeded fact evaluation

remove support for < 4.0.0
voxpupuli · Mar 30, 2018 · 2504c90 · 2504c90
1 parent a00bc49
commit 2504c90
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -146,7 +146,7 @@
       tries       => 5,
     }
 
-    if is_hash($postgresql) {
+    if $postgresql =~ Hash {
       unless $postgresql[enable] {
         exec { 'gitlab_setup':
           command     => "/bin/echo yes | ${rake_exec} gitlab:setup",

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -49,15 +49,16 @@
         }
       }
       'redhat': {
-
         $gpgkey = $edition ? {
             'ee'    => 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey https://packages.gitlab.com/gitlab/gitlab-ee/gpgkey/gitlab-gitlab-ee-3D645A26AB9FBD22.pub.gpg',
             'ce'    => 'https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey/gitlab-gitlab-ce-3D645A26AB9FBD22.pub.gpg'
         }
 
+        $releasever = $facts['os']['release']['major']
+
         yumrepo { "gitlab_official_${edition}":
           descr         => 'Official repository for Gitlab',
-          baseurl       => "https://packages.gitlab.com/gitlab/gitlab-${edition}/el/${::operatingsystemmajrelease}/\$basearch",
+          baseurl       => "https://packages.gitlab.com/gitlab/gitlab-${edition}/el/${releasever}/\$basearch",
           enabled       => 1,
           repo_gpgcheck => 1,
           gpgcheck      => 1,

diff --git a/metadata.json b/metadata.json
@@ -68,7 +68,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=4.10.0 <6.0.0"
+      "version_requirement": ">=4.10.0 <6.0.0
     }
   ]
 }