Merge pull request voxpupuli#252 from LongLiveCHIEF/remove-params-man…

…ifest removed params.pp in accordance with module best practices design
LongLiveCHIEF · Jul 8, 2018 · b9cb5b7 · b9cb5b7
2 parents 0103a00 + 214058e
commit b9cb5b7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 23 deletions.
diff --git a/data/RedHat/6.yaml b/data/RedHat/6.yaml
@@ -0,0 +1 @@
+gitlab::service_enable: false
diff --git a/hiera.yaml b/hiera.yaml
@@ -6,6 +6,8 @@ defaults:
   data_hash: yaml_data
 
 hierarchy:
+  - name: 'OS Major Release Overrides'
+    path: "%{facts.os.family}/%{facts.os.release.major}.yaml"
   - name: 'Operating System Family'
     path: "%{facts.os.family}.yaml"
   - name: 'Defaults'

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -333,13 +333,13 @@
   String                         $service_user                    = 'root',
   String                         $service_group                   = 'root',
   # gitlab specific
-  String                         $rake_exec                       = $::gitlab::params::rake_exec,
+  String                         $rake_exec                       = '/usr/bin/gitlab-rake',
   Optional[Hash]                 $ci_redis                        = undef,
   Optional[Hash]                 $ci_unicorn                      = undef,
   Boolean                        $config_manage                   = true,
   Stdlib::Absolutepath           $config_file                     = '/etc/gitlab/gitlab.rb',
   Optional[String]               $custom_hooks_dir                = undef,
-  Stdlib::Httpurl                $external_url                    = $::gitlab::params::external_url,
+  Stdlib::Httpurl                $external_url                    = "http://${facts['networking']['fqdn']}",
   Optional[Integer[1, 65565]]    $external_port                   = undef,
   Optional[Hash]                 $geo_postgresql                  = undef,
   Boolean                        $geo_primary_role                = false,
@@ -401,7 +401,7 @@
   Array                          $backup_cron_skips               = [],
   Hash                           $custom_hooks                    = {},
   Hash                           $global_hooks                    = {},
-) inherits gitlab::params {
+) {
 
   include gitlab::omnibus_package_repository
 

diff --git a/manifests/params.pp b/manifests/params.pp
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -8,7 +8,6 @@
       end
 
       context 'with default params' do
-        it { is_expected.to contain_class('gitlab::params') }
         it { is_expected.to contain_class('gitlab::host_config').that_comes_before('Class[gitlab::install]') }
         it { is_expected.to contain_class('gitlab::omnibus_config').that_comes_before('Class[gitlab::install]') }
         it { is_expected.to contain_class('gitlab::install').that_comes_before('Class[gitlab::service]') }