[icinga-checkins] icinga.org: puppet-icingaweb2/master: remove dependency on concat module

git at icinga.org git at icinga.org
Tue Jan 3 16:42:54 CET 2017


Module: puppet-icingaweb2
Branch: master
Commit: 436308eacbaf6d2747e7114874755d8fef348e24
URL:    https://git.icinga.org/?p=puppet-icingaweb2.git;a=commit;h=436308eacbaf6d2747e7114874755d8fef348e24

Author: Lorenz Bischof <lorenzbischof at gmail.com>
Date:   Sat Dec  3 10:56:54 2016 +0100

remove dependency on concat module

---

 .fixtures.yml                                       |    1 -
 metadata.json                                       |    1 -
 spec/classes/icingaweb2_mod_businessprocess_spec.rb |    1 -
 spec/classes/icingaweb2_mod_deployment_spec.rb      |    1 -
 spec/classes/icingaweb2_mod_graphite_spec.rb        |    1 -
 spec/classes/icingaweb2_mod_monitoring_spec.rb      |    1 -
 spec/classes/icingaweb2_mod_nagvis_spec.rb          |    1 -
 spec/classes/icingaweb2_spec.rb                     |    3 ---
 8 files changed, 10 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 3c206b5..adea607 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,6 @@
 fixtures:
   repositories:
     apache:  'https://github.com/puppetlabs/puppetlabs-apache'
-    concat:  'https://github.com/puppetlabs/puppetlabs-concat'
     inifile: 'https://github.com/puppetlabs/puppetlabs-inifile'
     stdlib:  'https://github.com/puppetlabs/puppetlabs-stdlib'
     vcsrepo: 'https://github.com/puppetlabs/puppetlabs-vcsrepo'
diff --git a/metadata.json b/metadata.json
index cf418ec..8dddac3 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,7 +9,6 @@
   "issues_url": "https://dev.icinga.org/projects/puppet-icingaweb2",
   "dependencies": [
     {"name":"puppetlabs/apache","version_requirement":">= 1.2.0 < 2.0.0"},
-    {"name":"puppetlabs/concat","version_requirement":">= 1.2.0 < 2.0.0"},
     {"name":"puppetlabs/inifile","version_requirement":">= 1.2.0 < 2.0.0"},
     {"name":"puppetlabs/stdlib","version_requirement":">= 4.4.0 < 5.0.0"},
     {"name":"puppetlabs/vcsrepo","version_requirement":">= 1.2.0 < 2.0.0"}
diff --git a/spec/classes/icingaweb2_mod_businessprocess_spec.rb b/spec/classes/icingaweb2_mod_businessprocess_spec.rb
index 430a7e9..9975dd5 100644
--- a/spec/classes/icingaweb2_mod_businessprocess_spec.rb
+++ b/spec/classes/icingaweb2_mod_businessprocess_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2::mod::businessprocess', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
 
   let :pre_condition do
diff --git a/spec/classes/icingaweb2_mod_deployment_spec.rb b/spec/classes/icingaweb2_mod_deployment_spec.rb
index e4159f0..6d861cc 100644
--- a/spec/classes/icingaweb2_mod_deployment_spec.rb
+++ b/spec/classes/icingaweb2_mod_deployment_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2::mod::deployment', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
 
   let :pre_condition do
diff --git a/spec/classes/icingaweb2_mod_graphite_spec.rb b/spec/classes/icingaweb2_mod_graphite_spec.rb
index 57566f4..fb6a1a8 100644
--- a/spec/classes/icingaweb2_mod_graphite_spec.rb
+++ b/spec/classes/icingaweb2_mod_graphite_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2::mod::graphite', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
 
   let :pre_condition do
diff --git a/spec/classes/icingaweb2_mod_monitoring_spec.rb b/spec/classes/icingaweb2_mod_monitoring_spec.rb
index f046334..8079256 100644
--- a/spec/classes/icingaweb2_mod_monitoring_spec.rb
+++ b/spec/classes/icingaweb2_mod_monitoring_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2::mod::monitoring', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
 
   let :pre_condition do
diff --git a/spec/classes/icingaweb2_mod_nagvis_spec.rb b/spec/classes/icingaweb2_mod_nagvis_spec.rb
index a32a615..d4083a6 100644
--- a/spec/classes/icingaweb2_mod_nagvis_spec.rb
+++ b/spec/classes/icingaweb2_mod_nagvis_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2::mod::nagvis', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
 
   let :pre_condition do
diff --git a/spec/classes/icingaweb2_spec.rb b/spec/classes/icingaweb2_spec.rb
index 8b67f64..bdd3562 100644
--- a/spec/classes/icingaweb2_spec.rb
+++ b/spec/classes/icingaweb2_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'icingaweb2', :type => :class do
-  let (:pre_condition) { '$concat_basedir = "/tmp"' }
   let (:facts) { debian_facts }
   let (:params) {
     {
@@ -375,7 +374,6 @@ describe 'icingaweb2', :type => :class do
   end
 
   describe 'with parameter: manage_apache_vhost' do
-    let (:pre_condition) { '$concat_basedir = "/tmp"' }
     context 'manage_apache_vhost => true' do
       let (:params) { { :manage_apache_vhost => true } }
 
@@ -646,7 +644,6 @@ describe 'icingaweb2', :type => :class do
   end
 
   describe 'with parameter: web_root' do
-    let (:pre_condition) { '$concat_basedir = "/tmp"' }
     context 'default' do
       let (:params) { { :web_root => '/web/root' } }
 



More information about the icinga-checkins mailing list