Merge pull request #126 from syseleven/fix-version-parameter

Change default of version parameter to 'installed'

Author: bastelfreak

README.md

@@ -342,8 +342,7 @@ Defaults to 'grafana-server'.
 
 ##### `version`
 
-The version of Grafana to install and manage. Defaults to the latest version of
-Grafana available at the time of module release.
+The version of Grafana to install and manage. Defaults to 'installed'
 
 ##### `sysconfig_location`
 

manifests/init.pp

@@ -54,7 +54,7 @@
 #
 # [*version*]
 # The version of Grafana to install and manage.
-# Defaults to the latest version of Grafana available at the time of module release.
+# Defaults to 'installed'
 #
 # [*repo_name*]
 # When using 'repo' install_method, the repo to look for packages in.
@@ -122,7 +122,7 @@
   Enum['stable', 'testing'] $repo_name  = $::grafana::params::repo_name,
   String $rpm_iteration                 = $::grafana::params::rpm_iteration,
   String $service_name                  = $::grafana::params::service_name,
-  String $version                       = $::grafana::params::version,
+  String $version                       = 'installed',
   Hash $plugins                         = {},
   Hash $provisioning_dashboards         = {},
   Hash $provisioning_datasources        = {},

manifests/params.pp

@@ -14,10 +14,10 @@
   $package_name                  = 'grafana'
   $rpm_iteration                 = '1'
   $repo_name                     = 'stable'
-  $version                       = '4.5.1'
   $create_subdirs_provisioning   = false
   $provisioning_dashboards_file  = '/etc/grafana/provisioning/dashboards/puppetprovisioned.yaml'
   $provisioning_datasources_file = '/etc/grafana/provisioning/datasources/puppetprovisioned.yaml'
+
   case $facts['os']['family'] {
     'Archlinux': {
       $manage_package_repo = false

spec/acceptance/class_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper_acceptance'
 
 describe 'grafana class' do
+  # Create dummy module directorty
+  shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/my_custom_module/files/dashboards')
+
   context 'default parameters' do
     # Using puppet_apply as a helper
     it 'works idempotently with no errors' do
@@ -35,7 +38,7 @@ class { 'grafana':
             type      => 'prometheus',
             access    => 'proxy',
             url       => 'http://localhost:9090/prometheus',
-            isDefault => true,
+            isDefault => false,
             },
           ],
         },
@@ -76,7 +79,7 @@ class { 'grafana':
             type      => 'prometheus',
             access    => 'proxy',
             url       => 'http://localhost:9090/prometheus',
-            isDefault => true,
+            isDefault => false,
             },
           ],
         },
@@ -96,8 +99,8 @@ class { 'grafana':
             },
           ],
         },
-        provisioning_dashboards_file  => '/opt/grafana/conf/provisioning/dashboards/dashboard.yaml',
-        provisioning_datasources_file => '/opt/grafana/conf/provisioning/datasources/datasources.yaml'
+        provisioning_dashboards_file  => '/etc/grafana/provisioning/dashboards/dashboard.yaml',
+        provisioning_datasources_file => '/etc/grafana/provisioning/datasources/datasources.yaml'
       }
       EOS
 

spec/classes/grafana_spec.rb

@@ -37,7 +37,8 @@
       context 'with parameter install_method is set to package' do
         let(:params) do
           {
-            install_method: 'package'
+            install_method: 'package',
+            version: '4.5.1'
           }
         end
 
@@ -113,7 +114,7 @@
           end
 
           describe 'install the package' do
-            it { is_expected.to contain_package('grafana').with_ensure('4.5.1') }
+            it { is_expected.to contain_package('grafana').with_ensure('installed') }
           end
         when 'RedHat'
           describe 'yum repo dependencies first' do
@@ -126,7 +127,7 @@
           end
 
           describe 'install the package' do
-            it { is_expected.to contain_package('grafana').with_ensure('4.5.1-1') }
+            it { is_expected.to contain_package('grafana').with_ensure('installed') }
           end
         end
       end
@@ -167,7 +168,8 @@
       context 'with parameter install_method is set to archive' do
         let(:params) do
           {
-            install_method: 'archive'
+            install_method: 'archive',
+            version: '4.5.1'
           }
         end