Merge pull request #217 from bastelfreak/fix216

Fix216
voxpupuli · May 13, 2016 · f58bdb0 · f58bdb0
2 parents f7a72d1 + 22329a0
commit f58bdb0
Show file tree

Hide file tree

Showing 33 changed files with 6 additions and 36 deletions.
diff --git a/lib/puppet/provider/zabbix.rb b/lib/puppet/provider/zabbix.rb
@@ -1,5 +1,5 @@
-# encoding: utf-8
 # zabbix provider type for puppet
+# rubocop:disable Style/ClassAndModuleChildren
 class Puppet::Provider::Zabbix < Puppet::Provider
   # Require the zabbixapi gem
   def self.require_zabbix

diff --git a/lib/puppet/provider/zabbix_application/ruby.rb b/lib/puppet/provider/zabbix_application/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_application).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def connect

diff --git a/lib/puppet/provider/zabbix_host/ruby.rb b/lib/puppet/provider/zabbix_host/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_host).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create

diff --git a/lib/puppet/provider/zabbix_hostgroup/ruby.rb b/lib/puppet/provider/zabbix_hostgroup/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_hostgroup).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def connect

diff --git a/lib/puppet/provider/zabbix_proxy/ruby.rb b/lib/puppet/provider/zabbix_proxy/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_proxy).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create

diff --git a/lib/puppet/provider/zabbix_template/ruby.rb b/lib/puppet/provider/zabbix_template/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_template).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create

diff --git a/lib/puppet/provider/zabbix_template_host/ruby.rb b/lib/puppet/provider/zabbix_template_host/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_template_host).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def template_name

diff --git a/lib/puppet/provider/zabbix_userparameters/ruby.rb b/lib/puppet/provider/zabbix_userparameters/ruby.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'zabbix'))
 Puppet::Type.type(:zabbix_userparameters).provide(:ruby, parent: Puppet::Provider::Zabbix) do
   def create

diff --git a/lib/puppet/type/zabbix_application.rb b/lib/puppet/type/zabbix_application.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 

diff --git a/lib/puppet/type/zabbix_host.rb b/lib/puppet/type/zabbix_host.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_host) do
   ensurable do
     defaultvalues

diff --git a/lib/puppet/type/zabbix_hostgroup.rb b/lib/puppet/type/zabbix_hostgroup.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 

diff --git a/lib/puppet/type/zabbix_proxy.rb b/lib/puppet/type/zabbix_proxy.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_proxy) do
   ensurable do
     defaultvalues

diff --git a/lib/puppet/type/zabbix_template.rb b/lib/puppet/type/zabbix_template.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 Puppet::Type.newtype(:zabbix_template) do
   ensurable do
     defaultvalues

diff --git a/lib/puppet/type/zabbix_template_host.rb b/lib/puppet/type/zabbix_template_host.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 require 'puppet/util/zabbix'
 

diff --git a/lib/puppet/type/zabbix_userparameters.rb b/lib/puppet/type/zabbix_userparameters.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..'))
 Puppet::Type.newtype(:zabbix_userparameters) do
   ensurable do

diff --git a/lib/puppet/util/zabbix.rb b/lib/puppet/util/zabbix.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 # this module adds additional params to a puppet type
 module Puppet::Util::Zabbix # rubocop:disable Style/ClassAndModuleChildren
   def self.add_zabbix_type_methods(type)

diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -265,8 +265,7 @@
   # is set to for example "eth1" or "bond0.73".
   if ($listenip != undef) {
     if ($listenip =~ /^(eth|bond|lxc|eno|tap|tun).*/) {
-      $int_name  = "ipaddress_${listenip}"
-      $listen_ip = inline_template('<%= scope.lookupvar(int_name) %>')
+      $int_name  = getvar("::ipaddress_${listenip}")
     } elsif is_ip_address($listenip) or $listenip == '*' {
       $listen_ip = $listenip
     } else {

diff --git a/manifests/proxy.pp b/manifests/proxy.pp
@@ -421,8 +421,7 @@
   # is set to for example "eth1" or "bond0.73".
   if ($listenip != undef) {
     if ($listenip =~ /^(eth|bond|lxc|eno|tap|tun).*/) {
-      $int_name  = "ipaddress_${listenip}"
-      $listen_ip = inline_template('<%= scope.lookupvar(int_name) %>')
+      $int_name  = getvar("::ipaddress_${listenip}")
     } elsif is_ip_address($listenip) {
       $listen_ip = $listenip
     } else {

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.1.0"
+      "version_requirement": ">= 4.4.0"
     },
     {
       "name": "puppetlabs/mysql",

diff --git a/spec/classes/agent_spec.rb b/spec/classes/agent_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::agent' do

diff --git a/spec/classes/coverage_spec.rb b/spec/classes/coverage_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'rspec-puppet'
 
 at_exit { RSpec::Puppet::Coverage.report! }
diff --git a/spec/classes/database_mysql_spec.rb b/spec/classes/database_mysql_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database::mysql' do

diff --git a/spec/classes/database_postgresql_spec.rb b/spec/classes/database_postgresql_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database::postgresql' do

diff --git a/spec/classes/database_spec.rb b/spec/classes/database_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::database' do

diff --git a/spec/classes/javagateway_spec.rb b/spec/classes/javagateway_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::javagateway' do

diff --git a/spec/classes/proxy_spec.rb b/spec/classes/proxy_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::proxy' do

diff --git a/spec/classes/repo_spec.rb b/spec/classes/repo_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::repo' do

diff --git a/spec/classes/sender_spec.rb b/spec/classes/sender_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::sender' do

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::server' do

diff --git a/spec/classes/userparameter_spec.rb b/spec/classes/userparameter_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::userparameter' do

diff --git a/spec/classes/web_spec.rb b/spec/classes/web_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 def package_provider_for_gems
@@ -117,7 +116,8 @@ def package_provider_for_gems
           database_name: 'zabbix-server',
           database_user: 'zabbix-server',
           database_password: 'zabbix-server',
-          zabbix_server: 'localhost')
+          zabbix_server: 'localhost'
+        )
       end
 
       it { should contain_file('/etc/zabbix/web/zabbix.conf.php').with_content(/^\$DB\['SERVER'\]   = 'localhost'/) }

diff --git a/spec/defines/userparameters_spec.rb b/spec/defines/userparameters_spec.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe 'zabbix::userparameters', type: :define do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts