diff --git a/.gitignore b/.gitignore index edb819a..2fff520 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ /spec/fixtures/manifests /spec/fixtures/modules /Gemfile.lock +/.yardwarns +/.yardoc +/doc diff --git a/CHANGELOG.md b/CHANGELOG.md index 49ba1b0..3893389 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +## 0.1.4 + +* improved deletion support + ## 0.1.3 * added system snmp variables: diff --git a/Rakefile b/Rakefile index cce01f2..6aa7843 100644 --- a/Rakefile +++ b/Rakefile @@ -3,9 +3,9 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' require 'metadata-json-lint/rake_task' PuppetLint.configuration.send('disable_80chars') -PuppetLint.configuration.send('disable_140chars') -PuppetLint.configuration.send('disable_class_inherits_from_params_class') PuppetLint.configuration.send('disable_documentation') +PuppetLint.configuration.send('disable_arrow_on_right_operand_line') +PuppetLint.configuration.send('disable_class_inherits_from_params_class') PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] desc "Validate manifests, templates, and ruby files" diff --git a/manifests/config.pp b/manifests/config.pp index 60f1ec6..338b2ba 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -4,12 +4,14 @@ # class snmpd::config inherits snmpd { - file { '/etc/snmp/snmpd.conf': - ensure => 'present', - owner => 'root', - group => 'root', - mode => '0600', - content => template("${module_name}/snmpdconf.erb"), + if($snmpd::manage_package and $snmpd::package_ensure!='absent') + { + file { '/etc/snmp/snmpd.conf': + ensure => 'present', + owner => 'root', + group => 'root', + mode => '0600', + content => template("${module_name}/snmpdconf.erb"), + } } - } diff --git a/metadata.json b/metadata.json index 3403f9a..408c9ac 100644 --- a/metadata.json +++ b/metadata.json @@ -1,11 +1,11 @@ { "name": "eyp-snmpd", - "version": "0.1.3", + "version": "0.1.4", "author": "eyp", "summary": "SNMP agent management", "license": "Apache-2.0", "source": "https://github.com/NTTCom-MS/eyp-snmpd", - "project_page": null, + "project_page": "https://github.com/NTTCom-MS/eyp-snmpd", "issues_url": "https://github.com/NTTCom-MS/eyp-snmpd/issues", "dependencies": [ {"name":"puppetlabs/stdlib","version_requirement":">= 1.0.0"}, @@ -38,10 +38,6 @@ } ], "requirements": [ - { - "name": "pe", - "version_requirement": ">= 3.0.0" - }, { "name": "puppet", "version_requirement": ">= 3.0.0" diff --git a/spec/acceptance/nodesets/centos5-docker.yml b/spec/acceptance/nodesets/centos5-docker.yml index b59472c..821f5a6 100644 --- a/spec/acceptance/nodesets/centos5-docker.yml +++ b/spec/acceptance/nodesets/centos5-docker.yml @@ -5,7 +5,7 @@ HOSTS: strict_variables: platform: el-5-x86_64 hypervisor : docker - image: tianon/centos:5.10 + image: jordiprats/centos5:5.11 docker_preserve_image: true docker_cmd: '["/sbin/init"]' docker_image_commands: