From 6277f0a189e6e8e457dba9ee5bfe2e303746157b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 16 Mar 2015 14:52:50 +0100 Subject: Add debian-8-x86_64-vagrant --- Gemfile | 2 +- spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 10 ++++++++++ 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml diff --git a/Gemfile b/Gemfile index a3a9eca..2cbe160 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false gem 'rspec', '~> 3.1.0', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet', :branch => 'rspec3' + gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false gem 'puppet-lint', :require => false diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 37dfc5f..2036c0b 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: centos-7-x86_64-genericcloud-20140929_01 user: centos CONFIG: diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index e52336b..c44f917 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-7-amd64-20141121 user: debian CONFIG: diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 194ca46..f7b2e50 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -4,10 +4,10 @@ HOSTS: strict_variables: platform: debian-8-amd64 hypervisor : openstack - flavor: m1.small + flavor: m1.medium image: debian-8-amd64-20141121 user: debian CONFIG: type: foss - openstack_network: default log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml new file mode 100644 index 0000000..38c844b --- /dev/null +++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + debian-8-x64: + default_apply_opts: + strict_variables: + platform: debian-8-amd64 + hypervisor : vagrant + box : camptocamp/debian-8-amd64 +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From f02d6faadd181493ccc9236f43296f2ba56ed592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 17 Mar 2015 15:58:12 +0100 Subject: Encourage file() usage --- README.md | 18 +++++++++------ manifests/lens.pp | 50 ++++++++++++++++++++++++++++++---------- spec/defines/augeas_lens_spec.rb | 2 +- 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e2055b0..863f4d6 100644 --- a/README.md +++ b/README.md @@ -36,18 +36,22 @@ The `augeas::lens` definition allows you to deploy an Augeas lens and any associ Parameters: - *ensure*: present/absent -- *lens_source*: the source for the lens -- *test_source*: optionally, the source for the test file. +- *lens_content*: the content of the lens +- *lens_source*: deprecated, the source for the lens +- *test_content*: optionally, the content of the test file +- *test_source*: deprecated, the source for the test file. - *stock_since*: optionally, indicate in which version of Augeas the lens became stock, so it will not be deployed above that version. Example usage: - augeas::lens { 'networkmanager': - lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', - test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', - stock_since => '1.0.0', - } +```puppet +augeas::lens { 'networkmanager': + lens_content => file('networkmanager/lenses/networkmanager.aug'), + test_content => file('networkmanager/lenses/test_networkmanager.aug'), + stock_since => '1.0.0', +} +``` ### Functions diff --git a/manifests/lens.pp b/manifests/lens.pp index b5b9acd..f30a089 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -6,7 +6,9 @@ # # Parameters: # ['ensure'] - present/absent +# ['lens_content'] - the content of the lens # ['lens_source'] - the source for the lens +# ['test_content'] - optionally, the content of the test # ['test_source'] - optionally, the source for the test file. # ['stock_since'] - optionally, indicate in which version of Augeas # the lens became stock, so it will not be deployed @@ -15,21 +17,43 @@ # Example usage: # # augeas::lens { 'networkmanager': -# lens_source => 'puppet:///modules/networkmanager/lenses/networkmanager.aug', -# test_source => 'puppet:///modules/networkmanager/lenses/test_networkmanager.aug', -# stock_since => '1.0.0', +# lens_content => file('networkmanager/lenses/networkmanager.aug'), +# test_content => file('networkmanager/lenses/test_networkmanager.aug'), +# stock_since => '1.0.0', # } # define augeas::lens ( - $lens_source, - $ensure=present, - $test_source=false, - $stock_since=false, + $ensure = present, + $lens_content = undef, + $lens_source = undef, + $test_content = undef, + $test_source = undef, + $stock_since = false, ) { if !defined(Class['augeas']) { fail('You must declare the augeas class before using augeas::lens') } + if $lens_source != undef { + if $lens_content != undef { + fail "You can't set both \$lens_source and \$lens_content" + } else { + warning 'Passing "lens_source" is deprecated; please use "lens_content"' + } + } else { + if $lens_content == undef { + fail "You must set either \$lens_source or \$lens_content" + } + } + + if $test_source != undef { + if $test_content != undef { + fail "You can't set both \$test_source and \$test_content" + } else { + warning 'Passing "test_source" is deprecated; please use "test_content"' + } + } + File { owner => 'root', group => 'root', @@ -52,8 +76,9 @@ define augeas::lens ( $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" file { $lens_dest: - ensure => $ensure, - source => $lens_source, + ensure => $ensure, + source => $lens_source, + content => $lens_content, } exec { "Typecheck lens ${name}": @@ -64,9 +89,10 @@ define augeas::lens ( if $test_source { file { $test_dest: - ensure => $ensure, - source => $test_source, - notify => Exec["Test lens ${name}"], + ensure => $ensure, + source => $test_source, + content => $test_content, + notify => Exec["Test lens ${name}"], } exec { "Test lens ${name}": diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 7feeefb..21dfd55 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -37,7 +37,7 @@ describe 'augeas::lens' do it 'should error' do expect { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /Must pass lens_source/) + }.to raise_error(Puppet::Error, /You must set either \$lens_source or \$lens_content/) end end -- cgit v1.2.3 From d8a68f45e56d0554d7d5c606d43ae04fcd137a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 24 Mar 2015 10:22:51 +0100 Subject: Release 1.1.7 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bebf66..67dc24f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-03-24 - Release 1.1.7 + +- Fix for SUSE + ## 2015-01-19 - Release 1.1.6 - Add puppet-ling plugins diff --git a/metadata.json b/metadata.json index f6bfbf9..299d03c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.6", + "version": "1.1.7", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 56c169fdbfffa3f9a556d39e33a6810b2cd99808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 24 Mar 2015 16:28:17 +0100 Subject: Fix augeas() function: use symbol for method name --- lib/puppet/parser/functions/augeas.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/parser/functions/augeas.rb b/lib/puppet/parser/functions/augeas.rb index 08026f7..610aa8a 100644 --- a/lib/puppet/parser/functions/augeas.rb +++ b/lib/puppet/parser/functions/augeas.rb @@ -36,7 +36,7 @@ Would result in: aug = Augeas::open(nil, nil, Augeas::NO_MODL_AUTOLOAD) augeas_version = aug.get('/augeas/version') raise(Puppet::ParseError, 'augeas(): requires Augeas 1.0.0 or greater') unless Puppet::Util::Package.versioncmp(augeas_version, '1.0.0') >= 0 - raise(Puppet::ParseError, 'augeas(): requires ruby-augeas 0.5.0 or greater') unless aug.methods.include?('text_store') + raise(Puppet::ParseError, 'augeas(): requires ruby-augeas 0.5.0 or greater') unless aug.methods.include?(:text_store) result = nil begin -- cgit v1.2.3 From ee459bb7977fb472fd140f4e2142d09f2aa6ac81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 24 Mar 2015 16:32:40 +0100 Subject: Update README.md [skip ci] --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 863f4d6..5a27b48 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # Augeas Puppet module -[![Puppet Forge](http://img.shields.io/puppetforge/v/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) -[![Build Status](https://travis-ci.org/camptocamp/puppet-augeas.png?branch=master)](https://travis-ci.org/camptocamp/puppet-augeas) +[![Puppet Forge Version](http://img.shields.io/puppetforge/v/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) +[![Puppet Forge Downloads](http://img.shields.io/puppetforge/dt/camptocamp/augeas.svg)](https://forge.puppetlabs.com/camptocamp/augeas) +[![Build Status](https://img.shields.io/travis/camptocamp/puppet-augeas/master.svg)](https://travis-ci.org/camptocamp/puppet-augeas) +[![Gemnasium](https://img.shields.io/gemnasium/camptocamp/puppet-augeas.svg)](https://gemnasium.com/camptocamp/puppet-augeas) +[![By Camptocamp](https://img.shields.io/badge/by-camptocamp-fb7047.svg)](http://www.camptocamp.com) **Install and configure Augeas.** -- cgit v1.2.3 From 2d0d06841f7c8bd67564152ad3b4a5f661e890cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 24 Mar 2015 16:32:48 +0100 Subject: Release 1.2.0 --- CHANGELOG.md | 5 +++++ metadata.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67dc24f..0b8d1a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2015-03-24 - Release 1.2.0 + +- Add lens_content and test_content to augeas::lens +- Fix augeas() function + ## 2015-03-24 - Release 1.1.7 - Fix for SUSE diff --git a/metadata.json b/metadata.json index 299d03c..092a4b1 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.1.7", + "version": "1.2.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 7ae0e0e49a2705f28bdf60d56fc9ecfb8822cd94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 26 Mar 2015 10:56:40 +0100 Subject: Confine rspec pinning to ruby18 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2cbe160..57fcd08 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec', '~> 3.1.0', :require => false + gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1.8/ gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false -- cgit v1.2.3 From f582c63c573287bcfc7d28b928897e530c321791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 31 Mar 2015 11:36:51 +0200 Subject: Update with msync --- spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/centos-6-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml | 10 ++++++++++ spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 4 ++-- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 4 ++-- 9 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml create mode 100644 spec/acceptance/nodesets/debian-6-x86_64-openstack.yml diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml new file mode 100644 index 0000000..b88cc95 --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : docker + image: centos:6 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml new file mode 100644 index 0000000..0291ce5 --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : openstack + flavor: m1.small + image: centos-6-latest + user: root +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml new file mode 100644 index 0000000..191329c --- /dev/null +++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml @@ -0,0 +1,10 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + strict_variables: + platform: el-6-x86_64 + hypervisor : vagrant + box : camptocamp/centos-6-x86_64 +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 2036c0b..b0769b9 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : openstack - flavor: m1.medium - image: centos-7-x86_64-genericcloud-20140929_01 + flavor: m1.small + image: centos-7-latest user: centos CONFIG: type: foss diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index fe0f83b..6f02769 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: el-7-x86_64 hypervisor : vagrant - box : puppetlabs/centos-7.0-64-nocm + box : camptocamp/centos-7-x86_64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml new file mode 100644 index 0000000..276356b --- /dev/null +++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + strict_variables: + platform: debian-6-amd64 + hypervisor : openstack + flavor: m1.small + image: debian-6-latest + user: debian +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index c44f917..8c23792 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : openstack - flavor: m1.medium - image: debian-7-amd64-20141121 + flavor: m1.small + image: debian-7-latest user: debian CONFIG: type: foss diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 86c2165..21aee50 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -4,7 +4,7 @@ HOSTS: strict_variables: platform: debian-7-amd64 hypervisor : vagrant - box : puppetlabs/debian-7.8-64-nocm + box : camptocamp/debian-7-amd64 CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index f7b2e50..94fe73a 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -4,8 +4,8 @@ HOSTS: strict_variables: platform: debian-8-amd64 hypervisor : openstack - flavor: m1.medium - image: debian-8-amd64-20141121 + flavor: m1.small + image: debian-8-latest user: debian CONFIG: type: foss -- cgit v1.2.3 From 366c331fba8386c8b22750705c43fa9fccf5e14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 3 Apr 2015 11:48:26 +0200 Subject: Release 1.2.1 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b8d1a8..6a2392c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-04-03 - Release 1.2.1 + +- Confine rspec pinning to ruby 1.8 + ## 2015-03-24 - Release 1.2.0 - Add lens_content and test_content to augeas::lens diff --git a/metadata.json b/metadata.json index 092a4b1..58d3761 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.0", + "version": "1.2.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 23426fe87b89c50e7531519f31cbeab1b463d2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 8 Apr 2015 14:49:41 +0200 Subject: Add puppet-lint-fileserver-check to Gemfile --- Gemfile | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml diff --git a/Gemfile b/Gemfile index 57fcd08..e7f2e46 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ group :development, :unit_tests do gem 'puppet-lint-leading_zero-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false + gem 'puppet-lint-fileserver-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false gem 'rspec-puppet-facts', :require => false end diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml new file mode 100644 index 0000000..073562e --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-14.04-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1404-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From 0ecd303db089f8b0417c3fa963cdf760ca7869ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 8 Apr 2015 15:39:59 +0200 Subject: Remove puppet-lint-fileserver-check from Gemfile --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index e7f2e46..57fcd08 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ group :development, :unit_tests do gem 'puppet-lint-leading_zero-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false - gem 'puppet-lint-fileserver-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false gem 'rspec-puppet-facts', :require => false end -- cgit v1.2.3 From d3680fa5666d7ed9d9d7c5a32ddb1a6d6294d14b Mon Sep 17 00:00:00 2001 From: Craig Watson Date: Wed, 8 Apr 2015 21:29:17 +0100 Subject: Fixing lens test with content but no source --- manifests/lens.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index f30a089..c374417 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -87,7 +87,7 @@ define augeas::lens ( subscribe => File[$lens_dest], } - if $test_source { + if $test_source or $test_content { file { $test_dest: ensure => $ensure, source => $test_source, -- cgit v1.2.3 From 1db1ae68f55fc97f1a8bc0d22f3cd0cf5b3af862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 14 Apr 2015 08:38:52 +0200 Subject: Release 1.2.2 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a2392c..b37ecd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-04-14 - Release 1.2.2 + +- Fix lens test with content but no source + ## 2015-04-03 - Release 1.2.1 - Confine rspec pinning to ruby 1.8 diff --git a/metadata.json b/metadata.json index 58d3761..23bfda9 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.1", + "version": "1.2.2", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From f4e49b2f36b26765db83105b801ca088a7f1d7d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 14 Apr 2015 11:24:39 +0200 Subject: Add puppet-lint-fileserver-check --- Gemfile | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 57fcd08..baced22 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ group :development, :unit_tests do gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false + gem 'puppet-lint-fileserver-check', :require => false gem 'rspec-puppet-facts', :require => false end diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml index a3edb70..7188ccb 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - ubuntu-14.04-x64: + ubuntu-1404-x64: default_apply_opts: strict_variables: platform: ubuntu-14.04-amd64 -- cgit v1.2.3 From 101f0ff0b6d4bc8f53b9582410b6a8130668f8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 17 Apr 2015 10:19:56 +0200 Subject: Add nodeset for centos5 on docker --- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 spec/acceptance/nodesets/centos-5-x86_64-docker.yml diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml new file mode 100644 index 0000000..174460d --- /dev/null +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + centos-5-x64: + default_apply_opts: + strict_variables: + platform: el-5-x86_64 + hypervisor : docker + image: centos:5 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug -- cgit v1.2.3 From 43505344722e92fc7a56238cd88cc92bf984d182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 17 Apr 2015 10:32:06 +0200 Subject: Add missing anchors --- manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 41f4f87..653925e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,9 +14,10 @@ class augeas ( $purge = true, ) inherits augeas::params { + anchor { 'augeas::begin': } -> class {'::augeas::packages': } -> class {'::augeas::files': } -> - Class['augeas'] + anchor { 'augeas::end': } # lint:ignore:spaceship_operator_without_tag Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> -- cgit v1.2.3 From c986c38782f4ef9637443f8c3bc20d0f6b6f6866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 17 Apr 2015 14:05:16 +0200 Subject: Release 1.2.3 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b37ecd2..0859930 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-04-17 - Release 1.2.3 + +- Add beaker nodesets + ## 2015-04-14 - Release 1.2.2 - Fix lens test with content but no source diff --git a/metadata.json b/metadata.json index 23bfda9..f48abbf 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.2", + "version": "1.2.3", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 7725b10d1fd6bc33fbc0cfd2ab57096c1b6635fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 23 Apr 2015 09:04:29 +0200 Subject: Add Puppet 4 to travis matrix --- .travis.yml | 2 ++ spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 2 +- 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml diff --git a/.travis.yml b/.travis.yml index 777290c..cc61c5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 4.0" notifications: email: false deploy: diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml new file mode 100644 index 0000000..523c7cf --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1004-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-10.04-amd64 + hypervisor : docker + image: ubuntu:10.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml new file mode 100644 index 0000000..890730a --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : docker + image: ubuntu:12.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml new file mode 100644 index 0000000..744e027 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1404-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : docker + image: ubuntu:14.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml index 073562e..1c163ba 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - ubuntu-14.04-x64: + ubuntu-1404-x64: default_apply_opts: strict_variables: platform: ubuntu-14.04-amd64 -- cgit v1.2.3 From e63376800d2bce368113bd359b2cccd601b48c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 23 Apr 2015 09:28:00 +0200 Subject: Move Puppet 4 test to allowed failures --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index cc61c5f..5daa85a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.0 env: PUPPET_GEM_VERSION="~> 4.0" + allow_failures: + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 4.0" notifications: email: false deploy: -- cgit v1.2.3 From d6433a149a8f142c5c407f3a576fbc68a215add1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 23 Apr 2015 13:24:19 +0200 Subject: Pin beaker to < 2.10 in Gemspec --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index baced22..a4129a1 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,9 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'serverspec', :require => false + gem 'beaker', '< 2.10', :require => false + gem 'beaker-rspec', :require => false + gem 'serverspec', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From 5a9fc7722d7a4110f40ca5974474f00a08d3f9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 27 Apr 2015 13:41:48 +0200 Subject: Add nodeset ubuntu-12.04-x86_64-openstack --- spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml new file mode 100644 index 0000000..07f8330 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1204-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From cf0d05abc43e30ba9d06d29444690cf3a5f4ad0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 27 Apr 2015 13:41:49 +0200 Subject: Release version 1.2.4 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0859930..efeafdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-04-27 - Release 1.2.4 + +Add nodeset ubuntu-12.04-x86_64-openstack + ## 2015-04-17 - Release 1.2.3 - Add beaker nodesets diff --git a/metadata.json b/metadata.json index f48abbf..dfc85ea 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.3", + "version": "1.2.4", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 4519e09559cd1a2abc11f0c3b8c9d6933cc673a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 12 May 2015 10:25:02 +0200 Subject: Don't pin beaker --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a4129a1..baced22 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,9 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', '< 2.10', :require => false - gem 'beaker-rspec', :require => false - gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'serverspec', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From a21e50800c045f898275a882b0e6e8d5b2838a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 12 May 2015 10:25:03 +0200 Subject: Release version 1.2.5 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efeafdb..8d9f61b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-12 - Release 1.2.5 + +Don't pin beaker + ## 2015-04-27 - Release 1.2.4 Add nodeset ubuntu-12.04-x86_64-openstack diff --git a/metadata.json b/metadata.json index dfc85ea..a9438fc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.4", + "version": "1.2.5", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 0e976ac436715e25317aa631ed2ff16ba121d6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 May 2015 16:17:23 +0200 Subject: Add puppet-lint-file_source_rights-check gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index baced22..7be0f80 100644 --- a/Gemfile +++ b/Gemfile @@ -18,6 +18,7 @@ group :development, :unit_tests do gem 'puppet-lint-file_ensure-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false gem 'puppet-lint-fileserver-check', :require => false + gem 'puppet-lint-file_source_rights-check', :require => false gem 'rspec-puppet-facts', :require => false end -- cgit v1.2.3 From af0e30bc8e111bcd059de4ffb2922466d55cd58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 May 2015 16:17:25 +0200 Subject: Release version 1.2.6 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9f61b..e0f1f13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-13 - Release 1.2.6 + +Add puppet-lint-file_source_rights-check gem + ## 2015-05-12 - Release 1.2.5 Don't pin beaker diff --git a/metadata.json b/metadata.json index a9438fc..1b06253 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.5", + "version": "1.2.6", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 44dd50c6673d3448eafd8606456f66622c9cae1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 May 2015 17:47:24 +0200 Subject: Ignore source_without_rights as there is a default in the scope --- manifests/lens.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifests/lens.pp b/manifests/lens.pp index c374417..c7dd6b2 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -75,11 +75,13 @@ define augeas::lens ( $lens_dest = "${augeas::lens_dir}/${name}.aug" $test_dest = "${augeas::lens_dir}/tests/test_${name}.aug" + # lint:ignore:source_without_rights file { $lens_dest: ensure => $ensure, source => $lens_source, content => $lens_content, } + # lint:endignore exec { "Typecheck lens ${name}": command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", @@ -88,12 +90,14 @@ define augeas::lens ( } if $test_source or $test_content { + # lint:ignore:source_without_rights file { $test_dest: ensure => $ensure, source => $test_source, content => $test_content, notify => Exec["Test lens ${name}"], } + # lint:endignore exec { "Test lens ${name}": command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", -- cgit v1.2.3 From 656716a1a5e3bc038a550d3cbad46836589bb053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 13 May 2015 17:47:57 +0200 Subject: Release 1.2.7 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f1f13..e424ca0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-13 - Release 1.2.7 + +Fix source_without_rights warning + ## 2015-05-13 - Release 1.2.6 Add puppet-lint-file_source_rights-check gem diff --git a/metadata.json b/metadata.json index 1b06253..68cb9ce 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.6", + "version": "1.2.7", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 7f024bf3d479bef3549c5c0cf876a8440b6a65b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 25 May 2015 14:38:11 +0200 Subject: Add workaround for unit tests on Puppet 4 [skip ci] --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 86cc740..c5b11ae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -35,7 +35,7 @@ Puppet[:modulepath] = File.join(dir, 'fixtures', 'modules') # ticket https://tickets.puppetlabs.com/browse/MODULES-823 # ver = Gem::Version.new(Puppet.version.split('-').first) -if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver +if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading" # libdir is only a single dir, so it can only workaround loading of one external module Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib" -- cgit v1.2.3 From bc3a61a4ae46b457af9c6c05e0dfcc32a5e010ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 25 May 2015 14:47:14 +0200 Subject: Don't allow failure on Puppet 4 --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5daa85a..cc61c5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,6 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.0 env: PUPPET_GEM_VERSION="~> 4.0" - allow_failures: - - rvm: 2.1.0 - env: PUPPET_GEM_VERSION="~> 4.0" notifications: email: false deploy: -- cgit v1.2.3 From 4b09858b2522ea925685f98b18b19f11ac3b2254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 25 May 2015 14:47:16 +0200 Subject: Release version 1.2.8 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e424ca0..62f46b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-25 - Release 1.2.8 + +Don't allow failure on Puppet 4 + ## 2015-05-13 - Release 1.2.7 Fix source_without_rights warning diff --git a/metadata.json b/metadata.json index 68cb9ce..be54e9d 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.7", + "version": "1.2.8", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From ee8aba40af3ebf7d94060823eec58a0e0463f293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20S=C3=A9hier?= Date: Tue, 26 May 2015 12:42:11 +0200 Subject: add utopic & vivid nodesets --- spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml | 13 +++++++++++++ spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 12 ++++++++++++ spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml | 13 +++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml new file mode 100644 index 0000000..f7736b5 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : docker + image: ubuntu:14.10 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml new file mode 100644 index 0000000..bbeded1 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1410-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml new file mode 100644 index 0000000..7521738 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -0,0 +1,12 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : docker + image: ubuntu:15.04 + # This stops the image from being deleted on completion, speeding up the process. + docker_preserve_image: true +CONFIG: + type: foss + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml new file mode 100644 index 0000000..d86c1e9 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml @@ -0,0 +1,13 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : openstack + flavor: m1.small + image: ubuntu-1504-latest + user: ubuntu +CONFIG: + type: foss + log_level: debug + openstack_network: default -- cgit v1.2.3 From 4d86100e3c461e3af85107531a780fac0957391e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20S=C3=A9hier?= Date: Tue, 26 May 2015 12:42:13 +0200 Subject: Release version 1.2.9 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62f46b2..8c89119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-26 - Release 1.2.9 + +add utopic & vivid nodesets + ## 2015-05-25 - Release 1.2.8 Don't allow failure on Puppet 4 diff --git a/metadata.json b/metadata.json index be54e9d..0238dbc 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.8", + "version": "1.2.9", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 46ef1fc76e6609e9c78dfd2552bb3b9ea647ae66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 26 May 2015 16:27:14 +0200 Subject: Use random application order in nodeset --- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml | 1 + spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml | 1 + spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 1 + spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml | 1 + 26 files changed, 26 insertions(+) diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml index 174460d..d9a52d8 100644 --- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-5-x64: default_apply_opts: + order: random strict_variables: platform: el-5-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml index b88cc95..b7a4396 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml index 0291ce5..e325b9e 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml index 191329c..f06036e 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: centos-6-x64: default_apply_opts: + order: random strict_variables: platform: el-6-x86_64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index 599a681..d891edf 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : docker diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index b0769b9..9003c86 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index 6f02769..95402e5 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: centos-7-x64: default_apply_opts: + order: random strict_variables: platform: el-7-x86_64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index 0296d12..685e2b7 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml index 276356b..c6c192f 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml index 23dae1b..03db0fa 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-6-x64: default_apply_opts: + order: random strict_variables: platform: debian-6-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index ef1c9b2..0be8845 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index 8c23792..017b4c7 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 21aee50..8ed1264 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-7-x64: default_apply_opts: + order: random strict_variables: platform: debian-7-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index 28c3e02..d3b89d9 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 94fe73a..003b6f4 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml index 38c844b..5cc7f0c 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: debian-8-x64: default_apply_opts: + order: random strict_variables: platform: debian-8-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml index 523c7cf..933dee6 100644 --- a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1004-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-10.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml index 890730a..92a7901 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1204-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-12.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml index 07f8330..f81b04b 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1204-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-12.04-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml index 744e027..7716f94 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml index 1c163ba..2eeb912 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml index 7188ccb..3b37695 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1404-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.04-amd64 hypervisor : vagrant diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml index f7736b5..256b004 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1410-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.10-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml index bbeded1..58a2acd 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1410-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-14.10-amd64 hypervisor : openstack diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml index 7521738..800da28 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1504-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-15.04-amd64 hypervisor : docker diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml index d86c1e9..22ef76c 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml @@ -1,6 +1,7 @@ HOSTS: ubuntu-1504-x64: default_apply_opts: + order: random strict_variables: platform: ubuntu-15.04-amd64 hypervisor : openstack -- cgit v1.2.3 From d929f5473a3ecb4a98454babd93b98e37be73d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Tue, 26 May 2015 16:27:15 +0200 Subject: Release version 1.2.10 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c89119..c0ed6b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-26 - Release 1.2.10 + +Use random application order in nodeset + ## 2015-05-26 - Release 1.2.9 add utopic & vivid nodesets diff --git a/metadata.json b/metadata.json index 0238dbc..375a8d7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.9", + "version": "1.2.10", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From fa540345f3f878824cd9229a3474b51e277b7b08 Mon Sep 17 00:00:00 2001 From: Taylan Develioglu Date: Thu, 28 May 2015 14:08:02 +0200 Subject: Allow setting package name of ruby augeas bindings --- manifests/init.pp | 4 +++- manifests/packages.pp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 41f4f87..094dda1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,13 +4,15 @@ # # Parameters: # ['version'] - the desired version of Augeas +# ['ruby_package'] - the desired package name of the Ruby bindings for Augeas # ['ruby_version'] - the desired version of the Ruby bindings for Augeas # ['lens_dir'] - the lens directory to use # ['purge'] - whether to purge lens directories class augeas ( $version = present, + $ruby_package = $::augeas::params::ruby_pkg, $ruby_version = present, - $lens_dir = $augeas::params::lens_dir, + $lens_dir = $::augeas::params::lens_dir, $purge = true, ) inherits augeas::params { diff --git a/manifests/packages.pp b/manifests/packages.pp index ff8628d..ff0d5c8 100644 --- a/manifests/packages.pp +++ b/manifests/packages.pp @@ -9,6 +9,6 @@ class augeas::packages { package { 'ruby-augeas': ensure => $::augeas::ruby_version, - name => $::augeas::params::ruby_pkg, + name => $::augeas::ruby_package, } } -- cgit v1.2.3 From dc54401f7da4d03ea20e31bcc7105357eea107cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 28 May 2015 14:50:01 +0200 Subject: Add beaker_spec_helper to Gemfile --- Gemfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7be0f80..45c03ce 100644 --- a/Gemfile +++ b/Gemfile @@ -23,9 +23,10 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'beaker_spec_helper', :require => false + gem 'serverspec', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From 158903264c3c77ea6e8ce96e240716b0686cfa78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Thu, 28 May 2015 14:50:04 +0200 Subject: Release version 1.2.11 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ed6b2..481630f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-05-28 - Release 1.2.11 + +Add beaker_spec_helper to Gemfile + ## 2015-05-26 - Release 1.2.10 Use random application order in nodeset diff --git a/metadata.json b/metadata.json index 375a8d7..3e3c2a5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.10", + "version": "1.2.11", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From b7cd43093d3cda9cb8b02827b7efcbf7ada26695 Mon Sep 17 00:00:00 2001 From: Alex Simenduev Date: Thu, 4 Jun 2015 23:18:16 +0300 Subject: Add support for Amazon Linux AMI --- manifests/params.pp | 6 +++++- metadata.json | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index e540033..6d4017e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,7 +7,11 @@ class augeas::params { case $::osfamily { 'RedHat': { - $ruby_pkg = 'ruby-augeas' + $ruby_pkg = $::operatingsystem ? { + # Amazon Linux AMI (2014.09 and 2015.03) uses ruby 2.0 + 'Amazon' => 'ruby20-augeas', + default => 'ruby-augeas' + } $augeas_pkgs = ['augeas', 'augeas-libs'] } diff --git a/metadata.json b/metadata.json index 3e3c2a5..3061051 100644 --- a/metadata.json +++ b/metadata.json @@ -46,7 +46,15 @@ "5", "6" ] + }, + { + "operatingsystem": "Amazon", + "operatingsystemrelease": [ + "2014.09", + "2015.03" + ] } + ], "puppet_version": [ "2.7", -- cgit v1.2.3 From 18a4c4a10b230e224f4b643c30e07811d3e0c22e Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sun, 14 Jun 2015 14:24:15 +0200 Subject: fix the ruby-augeas gem installation on SLES and openSUSE the current logic is broken, it pulls in the opposite package than what it should --- manifests/params.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index e540033..59023ab 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -12,13 +12,13 @@ class augeas::params { } 'Suse': { - # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet - # SLES 11 SP3 - if versioncmp($::rubyversion, '1.8.7') >= 0 { - $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' - # SLES 12 - } else { + # RPM Sources: https://build.opensuse.org/project/show/systemsmanagement:puppet + if versioncmp($::rubyversion, '2.1.2') >= 0 { + # SLES 12 / openSUSE $ruby_pkg = 'ruby2.1-rubygem-ruby-augeas' + } else { + # SLES 11 SP3 + $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas' } $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ] } -- cgit v1.2.3 From 3510b742cbc346a41b5eddb6f69a3e27a242cd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 24 Jun 2015 11:41:17 +0200 Subject: Release 1.2.12 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 481630f..ff8d4a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-06-24 - Release 1.2.12 + +fix the ruby-augeas gem installation on SLES and openSUSE + ## 2015-05-28 - Release 1.2.11 Add beaker_spec_helper to Gemfile diff --git a/metadata.json b/metadata.json index 3e3c2a5..2b38e5e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.11", + "version": "1.2.12", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 66fc39e05f085038ac91495f25969ff199ab16f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 26 Jun 2015 11:01:24 +0200 Subject: Fix strict_variables activation with rspec-puppet 2.2 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c5b11ae..94d30d5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,7 @@ RSpec.configure do |c| @old_env = {} ENV.each_key {|k| @old_env[k] = ENV[k]} - Puppet.settings[:strict_variables]=true if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('3.5') + c.strict_variables = Gem::Version.new(Puppet.version) >= Gem::Version.new('3.5') Puppet.features.stubs(:root?).returns(true) end -- cgit v1.2.3 From bfdd001967deb4760a017cbbe3fcb44138a906d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 26 Jun 2015 11:01:25 +0200 Subject: Release version 1.2.13 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff8d4a6..ad77af8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-06-26 - Release 1.2.13 + +Fix strict_variables activation with rspec-puppet 2.2 + ## 2015-06-24 - Release 1.2.12 fix the ruby-augeas gem installation on SLES and openSUSE diff --git a/metadata.json b/metadata.json index 2b38e5e..3dc6212 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.12", + "version": "1.2.13", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 17c054e40330fe26987a017274b569bde9611af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 21 Jul 2015 11:26:26 +0200 Subject: Add puppet-lint-alias-check gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 45c03ce..4f5c8da 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ group :development, :unit_tests do gem 'puppet-lint-version_comparison-check', :require => false gem 'puppet-lint-fileserver-check', :require => false gem 'puppet-lint-file_source_rights-check', :require => false + gem 'puppet-lint-alias-check', :require => false gem 'rspec-puppet-facts', :require => false end -- cgit v1.2.3 From 90095b9b9a6098258ecf4a4be5721964c93be2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 5 Aug 2015 13:06:40 +0200 Subject: Add publishing rake tasks --- Gemfile | 2 ++ Rakefile | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/Gemfile b/Gemfile index 4f5c8da..0cb5933 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,8 @@ group :development, :unit_tests do gem 'puppet-lint-file_source_rights-check', :require => false gem 'puppet-lint-alias-check', :require => false gem 'rspec-puppet-facts', :require => false + gem 'github_changelog_generator', :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/ + gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1.8/ end group :system_tests do diff --git a/Rakefile b/Rakefile index f87e608..adcac18 100644 --- a/Rakefile +++ b/Rakefile @@ -9,3 +9,15 @@ PuppetLint::RakeTask.new :lint do |config| end PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] + +# Publishing tasks +unless RUBY_VERSION =~ /^1\.8/ + require 'puppet_blacksmith' + require 'puppet_blacksmith/rake_tasks' + require 'github_changelog_generator/task' + GitHubChangelogGenerator::RakeTask.new :changelog do |config| + m = Blacksmith::Modulefile.new + config.future_release = m.version + config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s" + end +end -- cgit v1.2.3 From c401a47f78972143814bceba05f7aa615cfaf9b7 Mon Sep 17 00:00:00 2001 From: Roman Mueller Date: Tue, 21 Apr 2015 17:47:39 +0200 Subject: Initial support for Puppet 4 AIO package version --- manifests/init.pp | 21 ++++++++++++++------- manifests/lens.pp | 10 ++++++++-- manifests/params.pp | 7 ++++++- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 653925e..f927fe1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,12 +14,19 @@ class augeas ( $purge = true, ) inherits augeas::params { - anchor { 'augeas::begin': } -> - class {'::augeas::packages': } -> - class {'::augeas::files': } -> - anchor { 'augeas::end': } + if versioncmp($::puppetversion, '4.0.0') >= 0 { + anchor { 'augeas::begin': } -> + class {'::augeas::files': } -> + anchor { 'augeas::end': } + } else { + anchor { 'augeas::begin': } -> + class {'::augeas::packages': } -> + class {'::augeas::files': } -> + anchor { 'augeas::end': } + + # lint:ignore:spaceship_operator_without_tag + Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> + # lint:endignore + } - # lint:ignore:spaceship_operator_without_tag - Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> - # lint:endignore } diff --git a/manifests/lens.pp b/manifests/lens.pp index c7dd6b2..8c5733b 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -60,8 +60,14 @@ define augeas::lens ( mode => '0644', } - Exec { - path => $::path, + if versioncmp($::puppetversion, '4.0.0') >= 0 { + Exec { + path => "${::path}:/opt/puppetlabs/puppet/bin", + } + } else { + Exec { + path => $::path, + } } if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { diff --git a/manifests/params.pp b/manifests/params.pp index 59023ab..4ca216d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,12 @@ # Default parameters for the Augeas module # class augeas::params { - $lens_dir = '/usr/share/augeas/lenses' + + if versioncmp($::puppetversion, '4.0.0') >= 0 { + $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' + } else { + $lens_dir = '/usr/share/augeas/lenses' + } case $::osfamily { 'RedHat': { -- cgit v1.2.3 From 723382db55e6e3aebf9abdee83573f92f35071f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 12 Aug 2015 15:03:17 +0200 Subject: Fix unit tests --- spec/classes/augeas_spec.rb | 138 +++++++++++++++++++++------------------ spec/defines/augeas_lens_spec.rb | 23 ++++--- 2 files changed, 84 insertions(+), 77 deletions(-) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index ab4241f..32a390d 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,69 +5,76 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', + :osfamily => 'MS-DOS', + :puppetversion => Puppet.version, } end it 'should fail' do - expect { is_expected.to contain_package('ruby-augeas') }.to raise_error(Puppet::Error, /Unsupported OS family/) + expect { is_expected.to compile }.to raise_error(/Unsupported OS family/) end end + lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts + facts.merge({ + :puppetversion => Puppet.version, + }) end context 'without params' do - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => 'present' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => 'present' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => 'present', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => 'present' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => 'present' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => 'present' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => 'present', - :name => 'ruby-augeas' - ) } end - it { is_expected.to contain_file('/usr/share/augeas/lenses').with( + it { is_expected.to contain_file(lens_dir).with( :ensure => 'directory', :purge => 'true', :force => 'true', :recurse => 'true', :recurselimit => 1 ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/dist').with( + it { is_expected.to contain_file("#{lens_dir}/dist").with( :ensure => 'directory', :purge => 'false' ) } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests').with( + it { is_expected.to contain_file("#{lens_dir}/tests").with( :ensure => 'directory', :purge => 'true', :force => 'true' @@ -82,42 +89,43 @@ describe 'augeas' do } end - case facts[:osfamily] - when 'Debian' - it { is_expected.to contain_package('libaugeas0').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-tools').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-lenses').with( - :ensure => '1.2.3' - ) } - case facts[:lsbdistcodename] - when 'squeeze', 'lucid', 'precise' - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'libaugeas-ruby1.8' + if Puppet.version < '4.0.0' + case facts[:osfamily] + when 'Debian' + it { is_expected.to contain_package('libaugeas0').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-tools').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-lenses').with( + :ensure => '1.2.3' + ) } + case facts[:lsbdistcodename] + when 'squeeze', 'lucid', 'precise' + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.8' + ) } + else + it { is_expected.to contain_package('ruby-augeas').with( + :ensure => '3.2.1', + :name => 'libaugeas-ruby1.9.1' + ) } + end + when 'RedHat' + it { is_expected.to contain_package('augeas').with( + :ensure => '1.2.3' + ) } + it { is_expected.to contain_package('augeas-libs').with( + :ensure => '1.2.3' ) } - else it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', - :name => 'libaugeas-ruby1.9.1' + :name => 'ruby-augeas' ) } end - when 'RedHat' - it { is_expected.to contain_package('augeas').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('augeas-libs').with( - :ensure => '1.2.3' - ) } - it { is_expected.to contain_package('ruby-augeas').with( - :ensure => '3.2.1', - :name => 'ruby-augeas' - ) } end - end context 'with a non standard lens_dir' do diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 21dfd55..f4e5be7 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -11,12 +11,12 @@ describe 'augeas::lens' do end it 'should error' do - expect { - is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /You must declare the augeas class/) + expect { is_expected.to compile }.to raise_error(/You must declare the augeas class/) end end + lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' + context 'when declaring augeas class first' do on_supported_os.each do |os, facts| @@ -24,6 +24,7 @@ describe 'augeas::lens' do let(:facts) do facts.merge({ :augeasversion => :undef, + :puppetversion => Puppet.version, }) end @@ -35,9 +36,7 @@ describe 'augeas::lens' do context 'when no lens_source is passed' do it 'should error' do - expect { - is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') - }.to raise_error(Puppet::Error, /You must set either \$lens_source or \$lens_content/) + expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/) end end @@ -48,9 +47,9 @@ describe 'augeas::lens' do } end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.not_to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } + it { is_expected.not_to contain_file("#{lens_dir}/tests/test_foo.aug") } it { is_expected.not_to contain_exec('Test lens foo') } end @@ -62,9 +61,9 @@ describe 'augeas::lens' do } end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } + it { is_expected.to contain_file("#{lens_dir}/tests/test_foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } - it { is_expected.to contain_file('/usr/share/augeas/lenses/tests/test_foo.aug') } it { is_expected.to contain_exec('Test lens foo') } end end @@ -81,7 +80,7 @@ describe 'augeas::lens' do "class { '::augeas': version => '1.0.0' }" end - it { is_expected.to contain_file('/usr/share/augeas/lenses/foo.aug') } + it { is_expected.to contain_file("#{lens_dir}/foo.aug") } it { is_expected.to contain_exec('Typecheck lens foo') } end @@ -99,7 +98,7 @@ describe 'augeas::lens' do it do pending "undefined method `negative_failure_message'" - is_expected.not_to contain_file('/usr/share/augeas/lenses/foo.aug') + is_expected.not_to contain_file("#{lens_dir}/foo.aug") end it do pending "undefined method `negative_failure_message'" -- cgit v1.2.3 From 3e23d677370d44b62495022338b8cc12f42bd30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 12 Aug 2015 15:05:08 +0200 Subject: Always use $::path for exec --- manifests/lens.pp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index 8c5733b..e2c34de 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -60,16 +60,6 @@ define augeas::lens ( mode => '0644', } - if versioncmp($::puppetversion, '4.0.0') >= 0 { - Exec { - path => "${::path}:/opt/puppetlabs/puppet/bin", - } - } else { - Exec { - path => $::path, - } - } - if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) { validate_re( @@ -91,6 +81,7 @@ define augeas::lens ( exec { "Typecheck lens ${name}": command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", + path => $::path, refreshonly => true, subscribe => File[$lens_dest], } @@ -107,6 +98,7 @@ define augeas::lens ( exec { "Test lens ${name}": command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", + path => $::path, refreshonly => true, subscribe => File[$lens_dest, $test_dest], } -- cgit v1.2.3 From bb6ad1770a8d36d7941af1bf8ed53f3c1daf21ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 12 Aug 2015 15:14:59 +0200 Subject: Release 1.3.0 --- CHANGELOG.md | 6 ++++++ metadata.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad77af8..24510d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2015-08-12 - Release 1.3.0 + +Add puppet AIO packaging support +Allow setting package name of ruby augeas bindings +Add support for Amazon Linux AMI + ## 2015-06-26 - Release 1.2.13 Fix strict_variables activation with rspec-puppet 2.2 diff --git a/metadata.json b/metadata.json index 9d492a7..ad1d792 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.2.13", + "version": "1.3.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 7477ae8985d7615681443b4f3702014657981fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 21 Aug 2015 07:49:28 +0200 Subject: Use docker for acceptance tests --- .gitignore | 3 +++ .travis.yml | 2 +- spec/acceptance/nodesets/centos-5-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/centos-6-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml | 4 +++- spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml | 4 +++- 12 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b5b7a00..65839fa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ spec/fixtures/ .vagrant/ .bundle/ coverage/ +log/ +.*.swp +*~ diff --git a/.travis.yml b/.travis.yml index cc61c5f..a27a6e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - - rvm: 2.1.0 + - rvm: 2.1.6 env: PUPPET_GEM_VERSION="~> 4.0" notifications: email: false diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml index d9a52d8..679afb0 100644 --- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-5-x86_64 hypervisor : docker image: centos:5 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml index b7a4396..9cab03d 100644 --- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-6-x86_64 hypervisor : docker image: centos:6 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index d891edf..0bc9727 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: el-7-x86_64 hypervisor : docker image: centos:7 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/usr/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index 685e2b7..359dae7 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-6-amd64 hypervisor : docker image: debian:6 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index 0be8845..fc11f57 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-7-amd64 hypervisor : docker image: debian:7 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index d3b89d9..86a55e1 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: debian-8-amd64 hypervisor : docker image: debian:8 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml index 92a7901..f0ec72b 100644 --- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-12.04-amd64 hypervisor : docker image: ubuntu:12.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml index 7716f94..6fb9281 100644 --- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-14.04-amd64 hypervisor : docker image: ubuntu:14.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml index 256b004..2be425c 100644 --- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-14.10-amd64 hypervisor : docker image: ubuntu:14.10 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml index 800da28..caed722 100644 --- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml +++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml @@ -6,8 +6,10 @@ HOSTS: platform: ubuntu-15.04-amd64 hypervisor : docker image: ubuntu:15.04 - # This stops the image from being deleted on completion, speeding up the process. docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y wget' CONFIG: type: foss log_level: debug -- cgit v1.2.3 From cd584339eaa1eeb659ac37248d3b75f971898912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 21 Aug 2015 07:49:29 +0200 Subject: Release version 1.3.1 --- CHANGELOG.md | 4 ++++ metadata.json | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24510d7..b6f78c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-08-21 - Release 1.3.1 + +Use docker for acceptance tests + ## 2015-08-12 - Release 1.3.0 Add puppet AIO packaging support diff --git a/metadata.json b/metadata.json index ad1d792..5bcba39 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.3.0", + "version": "1.3.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", @@ -54,7 +54,6 @@ "2015.03" ] } - ], "puppet_version": [ "2.7", -- cgit v1.2.3 From 597a2fce2f85d4ea509cddf7d59858b13446e233 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 9 Jul 2015 16:27:05 -0500 Subject: Update lens location for Puppet Enterprise The lens location for Puppet Enterprise differs from the standard location for the opensource version. We can detect if we are running the enterprise version. This commit should resolve #52. --- manifests/params.pp | 3 +++ spec/classes/augeas_spec.rb | 35 +++++++++++++++++++++++++++++++++++ spec/defines/augeas_lens_spec.rb | 1 + 3 files changed, 39 insertions(+) diff --git a/manifests/params.pp b/manifests/params.pp index 3d0b0f5..cce558d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,6 +6,9 @@ class augeas::params { if versioncmp($::puppetversion, '4.0.0') >= 0 { $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' + } elsif (str2bool($::is_pe)) { + # puppet enterpise has a different lens location + $lens_dir = '/opt/puppet/share/augeas/lenses' } else { $lens_dir = '/usr/share/augeas/lenses' } diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 32a390d..b7c8273 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,6 +7,7 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, + :is_pe => false, } end @@ -22,6 +23,7 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, + :is_pe => false, }) end @@ -152,6 +154,39 @@ describe 'augeas' do :force => 'true' ).without(:recurse) } end + + context 'with Puppet Enterprise' do + let (:facts) do + facts.merge({ + :puppetversion => Puppet.version, + :is_pe => true, + }) + end + + if Puppet::Util::Package.versioncmp(Puppet.version, '4.0.0') >= 0 + # the enterprise lens dir is the same in 4 + pe_lens_dir = lens_dir + else + pe_lens_dir = '/opt/puppet/share/augeas/lenses' + end + + it { is_expected.to contain_file(pe_lens_dir).with( + :ensure => 'directory', + :force => 'true', + :recurse => 'true', + :recurselimit => 1 + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/dist").with( + :ensure => 'directory', + :purge => 'false' + ) } + it { is_expected.to contain_file("#{pe_lens_dir}/tests").with( + :ensure => 'directory', + :force => 'true', + :purge => 'true' + ).without(:recurse) } + end + end end end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index f4e5be7..57747ca 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -25,6 +25,7 @@ describe 'augeas::lens' do facts.merge({ :augeasversion => :undef, :puppetversion => Puppet.version, + :is_pe => false, }) end -- cgit v1.2.3 From 762de88d63ec7d75766a5a967a4f9b56b1f8011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 31 Aug 2015 11:55:30 +0200 Subject: Release 1.4.0 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f78c3..2d9bde1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-08-31 - Release 1.4.0 + +Add support for Puppet Enterprise paths + ## 2015-08-21 - Release 1.3.1 Use docker for acceptance tests diff --git a/metadata.json b/metadata.json index 5bcba39..52b00f3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.3.1", + "version": "1.4.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From d918035d3abb026c334e090fb8ac29974e0f12d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 31 Aug 2015 16:19:02 +0200 Subject: is_pe is not defined in Puppet open-source --- manifests/params.pp | 2 +- spec/classes/augeas_spec.rb | 2 -- spec/defines/augeas_lens_spec.rb | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index cce558d..dc64f9c 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -6,7 +6,7 @@ class augeas::params { if versioncmp($::puppetversion, '4.0.0') >= 0 { $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' - } elsif (str2bool($::is_pe)) { + } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string # puppet enterpise has a different lens location $lens_dir = '/opt/puppet/share/augeas/lenses' } else { diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index b7c8273..56870e0 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -7,7 +7,6 @@ describe 'augeas' do { :osfamily => 'MS-DOS', :puppetversion => Puppet.version, - :is_pe => false, } end @@ -23,7 +22,6 @@ describe 'augeas' do let(:facts) do facts.merge({ :puppetversion => Puppet.version, - :is_pe => false, }) end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 57747ca..f4e5be7 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -25,7 +25,6 @@ describe 'augeas::lens' do facts.merge({ :augeasversion => :undef, :puppetversion => Puppet.version, - :is_pe => false, }) end -- cgit v1.2.3 From b5f56643829f0e0a45be9cc353c90cebedd33416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 31 Aug 2015 16:19:44 +0200 Subject: Release 1.4.1 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d9bde1..52e103b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-08-31 - Release 1.4.1 + +Fix use of is_pe fact for Puppet open-source + ## 2015-08-31 - Release 1.4.0 Add support for Puppet Enterprise paths diff --git a/metadata.json b/metadata.json index 52b00f3..6c05178 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.4.0", + "version": "1.4.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 787d6af6b9de026ca487c352faf1187a74c3da5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:54:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 56870e0..5194bf2 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -40,6 +40,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' @@ -103,6 +108,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' -- cgit v1.2.3 From b7e05f3dee61d754ace620bb8a2fea508215a306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:58:26 +0200 Subject: Fix unit tests when using rspec-puppet-facts > 1.1.0 --- spec/classes/augeas_spec.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5194bf2..e9fa5fc 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -50,6 +50,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -118,6 +123,11 @@ describe 'augeas' do :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 8e8f2c5f4668e4f882123cf78568adc1660adc7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 16:46:05 +0200 Subject: Add Puppet AIO path --- manifests/lens.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index e2c34de..d6a3523 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -81,7 +81,7 @@ define augeas::lens ( exec { "Typecheck lens ${name}": command => "augparse -I ${augeas::lens_dir} ${lens_dest} || (rm -f ${lens_dest} && exit 1)", - path => $::path, + path => "/opt/puppetlabs/puppet/bin:${::path}", refreshonly => true, subscribe => File[$lens_dest], } @@ -98,7 +98,7 @@ define augeas::lens ( exec { "Test lens ${name}": command => "augparse -I ${augeas::lens_dir} ${test_dest} || (rm -f ${lens_dest} && rm -f ${test_dest} && exit 1)", - path => $::path, + path => "/opt/puppetlabs/puppet/bin:${::path}", refreshonly => true, subscribe => File[$lens_dest, $test_dest], } -- cgit v1.2.3 From b81fbe0eccd799083b3039a4fa8d079c816f0989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 9 Sep 2015 17:04:53 +0200 Subject: Release 1.4.2 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52e103b..5b52b1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2015-09-09 - Release 1.4.2 + +Fix for puppet AIO packaging + ## 2015-08-31 - Release 1.4.1 Fix use of is_pe fact for Puppet open-source diff --git a/metadata.json b/metadata.json index 6c05178..8ef25d2 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.4.1", + "version": "1.4.2", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From e3704016003bac7c775b15c2b936b47f2a7b79a0 Mon Sep 17 00:00:00 2001 From: jostmart Date: Mon, 25 Apr 2016 12:21:27 +0200 Subject: ruby-augeas instead of libaugeas-ruby root@x220:~# ruby --version ruby 2.1.5p273 (2014-11-13) [x86_64-linux-gnu] root@x220:~# dpkg -l | grep ruby-augeas ii ruby-augeas 1:0.5.0-3build1 amd64 Augeas bindings for the Ruby language root@x220:~# dpkg -l | grep libaugeas-ruby $ ruby --version ruby 1.9.3p484 (2013-11-22 revision 43786) [x86_64-linux] $ dpkg -l | grep ruby-augeas ii libaugeas-ruby 0.5.0-2 all Transitional package for ruby-augeas ii libaugeas-ruby1.9.1 0.5.0-2 all Transitional package for ruby-augeas ii ruby-augeas 0.5.0-2 amd64 Augeas bindings for the Ruby language --- manifests/params.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index dc64f9c..0ae3feb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -36,7 +36,10 @@ class augeas::params { } 'Debian': { - if versioncmp($::rubyversion, '1.9.1') >= 0 { + if versioncmp($::rubyversion, '2.1.0') >= 0 { + $ruby_pkg = 'ruby-augeas' + } + elsif versioncmp($::rubyversion, '1.9.1') >= 0 { $ruby_pkg = 'libaugeas-ruby1.9.1' } else { $ruby_pkg = 'libaugeas-ruby1.8' -- cgit v1.2.3 From f5048ab20c2679f379a0e6f356e304fd293efbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 4 May 2016 09:46:25 +0200 Subject: Update with modulesync --- .travis.yml | 10 +++++++--- Gemfile | 8 ++++---- Rakefile | 14 +++++++------- spec/acceptance/nodesets/centos-5.yml | 15 +++++++++++++++ spec/acceptance/nodesets/centos-6.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/centos-7.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-6.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-7.yml | 15 +++++++++++++++ spec/acceptance/nodesets/debian-8.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-12.04.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-14.04.yml | 18 ++++++++++++++++++ spec/acceptance/nodesets/ubuntu-14.10.yml | 18 ++++++++++++++++++ spec/acceptance/nodesets/ubuntu-15.04.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-15.10.yml | 16 ++++++++++++++++ spec/acceptance/nodesets/ubuntu-16.04.yml | 16 ++++++++++++++++ 15 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 spec/acceptance/nodesets/centos-5.yml create mode 100644 spec/acceptance/nodesets/centos-6.yml create mode 100644 spec/acceptance/nodesets/centos-7.yml create mode 100644 spec/acceptance/nodesets/debian-6.yml create mode 100644 spec/acceptance/nodesets/debian-7.yml create mode 100644 spec/acceptance/nodesets/debian-8.yml create mode 100644 spec/acceptance/nodesets/ubuntu-12.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-14.10.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.04.yml create mode 100644 spec/acceptance/nodesets/ubuntu-15.10.yml create mode 100644 spec/acceptance/nodesets/ubuntu-16.04.yml diff --git a/.travis.yml b/.travis.yml index a27a6e7..5fdc1c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,13 @@ --- language: ruby sudo: false +addons: + apt: + packages: + - libaugeas-dev cache: bundler bundler_args: --without system_tests -script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] +script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"] matrix: fast_finish: true include: @@ -15,7 +19,7 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - - rvm: 2.1.6 + - rvm: 2.1.7 env: PUPPET_GEM_VERSION="~> 4.0" notifications: email: false @@ -29,4 +33,4 @@ deploy: # all_branches is required to use tags all_branches: true # Only publish if our main Ruby target builds - rvm: 1.9.3 + rvm: 2.1.7 diff --git a/Gemfile b/Gemfile index 0cb5933..f0d7a49 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do - gem 'rake', :require => false - gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1.8/ + gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/ + gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/ gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false @@ -21,8 +21,8 @@ group :development, :unit_tests do gem 'puppet-lint-file_source_rights-check', :require => false gem 'puppet-lint-alias-check', :require => false gem 'rspec-puppet-facts', :require => false - gem 'github_changelog_generator', :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/ - gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1.8/ + gem 'ruby-augeas', :require => false + gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./ end group :system_tests do diff --git a/Rakefile b/Rakefile index adcac18..61faa29 100644 --- a/Rakefile +++ b/Rakefile @@ -11,13 +11,13 @@ end PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] # Publishing tasks -unless RUBY_VERSION =~ /^1\.8/ +unless RUBY_VERSION =~ /^1\./ require 'puppet_blacksmith' require 'puppet_blacksmith/rake_tasks' - require 'github_changelog_generator/task' - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - m = Blacksmith::Modulefile.new - config.future_release = m.version - config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s" - end + #require 'github_changelog_generator/task' + #GitHubChangelogGenerator::RakeTask.new :changelog do |config| + # m = Blacksmith::Modulefile.new + # config.future_release = m.version + # config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s" + #end end diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml new file mode 100644 index 0000000..b7ed0e5 --- /dev/null +++ b/spec/acceptance/nodesets/centos-5.yml @@ -0,0 +1,15 @@ +HOSTS: + centos-5-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-5-x86_64 + hypervisor : docker + image: tianon/centos:5.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget which' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml new file mode 100644 index 0000000..c82c10d --- /dev/null +++ b/spec/acceptance/nodesets/centos-6.yml @@ -0,0 +1,16 @@ +HOSTS: + centos-6-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-6-x86_64 + hypervisor : docker + image: centos:6 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm -rf /var/run/network/*' + - 'yum install -y crontabs tar wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml new file mode 100644 index 0000000..bc57539 --- /dev/null +++ b/spec/acceptance/nodesets/centos-7.yml @@ -0,0 +1,15 @@ +HOSTS: + centos-7-x64: + default_apply_opts: + order: random + strict_variables: + platform: el-7-x86_64 + hypervisor : docker + image: centos:7 + docker_preserve_image: true + docker_cmd: '["/usr/sbin/init"]' + docker_image_commands: + - 'yum install -y crontabs tar wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml new file mode 100644 index 0000000..d7b0275 --- /dev/null +++ b/spec/acceptance/nodesets/debian-6.yml @@ -0,0 +1,15 @@ +HOSTS: + debian-6-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-6-amd64 + hypervisor : docker + image: debian/eol:squeeze + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-7.yml b/spec/acceptance/nodesets/debian-7.yml new file mode 100644 index 0000000..9591ea7 --- /dev/null +++ b/spec/acceptance/nodesets/debian-7.yml @@ -0,0 +1,15 @@ +HOSTS: + debian-7-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-7-amd64 + hypervisor : docker + image: debian:7 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/debian-8.yml b/spec/acceptance/nodesets/debian-8.yml new file mode 100644 index 0000000..5fb24c6 --- /dev/null +++ b/spec/acceptance/nodesets/debian-8.yml @@ -0,0 +1,16 @@ +HOSTS: + debian-8-x64: + default_apply_opts: + order: random + strict_variables: + platform: debian-8-amd64 + hypervisor : docker + image: debian:8 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y cron locales-all net-tools wget' + - 'rm -f /usr/sbin/policy-rc.d' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-12.04.yml b/spec/acceptance/nodesets/ubuntu-12.04.yml new file mode 100644 index 0000000..594e177 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-12.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1204-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-12.04-amd64 + hypervisor : docker + image: ubuntu:12.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.04.yml b/spec/acceptance/nodesets/ubuntu-14.04.yml new file mode 100644 index 0000000..2b293c9 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.04.yml @@ -0,0 +1,18 @@ +HOSTS: + ubuntu-1404-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-14.04-amd64 + hypervisor : docker + image: ubuntu:14.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm /usr/sbin/policy-rc.d' + - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-14.10.yml b/spec/acceptance/nodesets/ubuntu-14.10.yml new file mode 100644 index 0000000..7ce09b2 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-14.10.yml @@ -0,0 +1,18 @@ +HOSTS: + ubuntu-1410-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-14.10-amd64 + hypervisor : docker + image: ubuntu:14.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'rm /usr/sbin/policy-rc.d' + - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl' + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.04.yml b/spec/acceptance/nodesets/ubuntu-15.04.yml new file mode 100644 index 0000000..329f331 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1504-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-15.04-amd64 + hypervisor : docker + image: ubuntu:15.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-15.10.yml b/spec/acceptance/nodesets/ubuntu-15.10.yml new file mode 100644 index 0000000..487795a --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-15.10.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1510-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-15.10-amd64 + hypervisor : docker + image: ubuntu:15.10 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml new file mode 100644 index 0000000..6c32b96 --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-16.04.yml @@ -0,0 +1,16 @@ +HOSTS: + ubuntu-1604-x64: + default_apply_opts: + order: random + strict_variables: + platform: ubuntu-16.04-amd64 + hypervisor : docker + image: ubuntu:16.04 + docker_preserve_image: true + docker_cmd: '["/sbin/init"]' + docker_image_commands: + - 'apt-get install -y net-tools wget' + - 'locale-gen en_US.UTF-8' +CONFIG: + type: aio + log_level: debug -- cgit v1.2.3 From 01f344c621d682168b7d19096cf6d4217af50d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 25 May 2016 09:00:52 +0200 Subject: Speed up acceptance tests on centos-5 --- Gemfile | 1 - spec/acceptance/nodesets/centos-5.yml | 1 + spec/acceptance/nodesets/centos-6.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f0d7a49..df5a5e3 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ group :development, :unit_tests do gem 'puppet-lint-trailing_comma-check', :require => false gem 'puppet-lint-file_ensure-check', :require => false gem 'puppet-lint-version_comparison-check', :require => false - gem 'puppet-lint-fileserver-check', :require => false gem 'puppet-lint-file_source_rights-check', :require => false gem 'puppet-lint-alias-check', :require => false gem 'rspec-puppet-facts', :require => false diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml index b7ed0e5..a26f27f 100644 --- a/spec/acceptance/nodesets/centos-5.yml +++ b/spec/acceptance/nodesets/centos-5.yml @@ -10,6 +10,7 @@ HOSTS: docker_cmd: '["/sbin/init"]' docker_image_commands: - 'yum install -y crontabs tar wget which' + - 'sed -i -e "/mingetty/d" /etc/inittab' CONFIG: type: aio log_level: debug diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml index c82c10d..71e23cd 100644 --- a/spec/acceptance/nodesets/centos-6.yml +++ b/spec/acceptance/nodesets/centos-6.yml @@ -11,6 +11,7 @@ HOSTS: docker_image_commands: - 'rm -rf /var/run/network/*' - 'yum install -y crontabs tar wget' + - 'rm /etc/init/tty.conf' CONFIG: type: aio log_level: debug -- cgit v1.2.3 From 7e86bedd8489eb47ea3e52b126bd20828d705eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:04:08 +0200 Subject: Check for valid OS first --- manifests/params.pp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0ae3feb..bf28630 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,15 +4,6 @@ # class augeas::params { - if versioncmp($::puppetversion, '4.0.0') >= 0 { - $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' - } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string - # puppet enterpise has a different lens location - $lens_dir = '/opt/puppet/share/augeas/lenses' - } else { - $lens_dir = '/usr/share/augeas/lenses' - } - case $::osfamily { 'RedHat': { $ruby_pkg = $::operatingsystem ? { @@ -49,4 +40,14 @@ class augeas::params { default: { fail("Unsupported OS family: ${::osfamily}") } } + + if versioncmp($::puppetversion, '4.0.0') >= 0 { + $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses' + } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string + # puppet enterpise has a different lens location + $lens_dir = '/opt/puppet/share/augeas/lenses' + } else { + $lens_dir = '/usr/share/augeas/lenses' + } + } -- cgit v1.2.3 From 06fe4f611a18886edea685c2ec1debc823966432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:05:55 +0200 Subject: r-p-f now sets puppetversion --- spec/classes/augeas_spec.rb | 10 +++------- spec/defines/augeas_lens_spec.rb | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index e9fa5fc..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -5,8 +5,7 @@ describe 'augeas' do context 'when on an unsupported Operating System' do let (:facts) do { - :osfamily => 'MS-DOS', - :puppetversion => Puppet.version, + :osfamily => 'MS-DOS', } end @@ -20,9 +19,7 @@ describe 'augeas' do on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts.merge({ - :puppetversion => Puppet.version, - }) + facts end context 'without params' do @@ -176,8 +173,7 @@ describe 'augeas' do context 'with Puppet Enterprise' do let (:facts) do facts.merge({ - :puppetversion => Puppet.version, - :is_pe => true, + :is_pe => true, }) end diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index f4e5be7..2132749 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -24,7 +24,6 @@ describe 'augeas::lens' do let(:facts) do facts.merge({ :augeasversion => :undef, - :puppetversion => Puppet.version, }) end -- cgit v1.2.3 From 9a88fbdf3e437bf5671bbc54ebf5031af24421c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:06:22 +0200 Subject: r-p-f now sets rubyversion --- spec/classes/augeas_spec.rb | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 16f76f4..5ee8df4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,21 +37,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -110,21 +100,11 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' - let(:facts) do - super().merge({ - :rubyversion => '1.8.7', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else - let(:facts) do - super().merge({ - :rubyversion => '1.9.3', - }) - end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From 3d5498d0bd4f7d6c8f8df0bafb9b98cf3da07a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:07:17 +0200 Subject: Override augeasversion fact instead of passing version to init --- spec/defines/augeas_lens_spec.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index 2132749..b74164b 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -19,20 +19,18 @@ describe 'augeas::lens' do context 'when declaring augeas class first' do + let(:pre_condition) do + "class { '::augeas': }" + end + on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do - facts.merge({ - :augeasversion => :undef, - }) + facts end context 'With standard augeas version' do - let(:pre_condition) do - "class { '::augeas': }" - end - context 'when no lens_source is passed' do it 'should error' do expect { is_expected.to compile }.to raise_error(/You must set either \$lens_source or \$lens_content/) @@ -75,8 +73,10 @@ describe 'augeas::lens' do } end - let(:pre_condition) do - "class { '::augeas': version => '1.0.0' }" + let(:facts) do + super().merge({ + :augeasversion => '1.0.0', + }) end it { is_expected.to contain_file("#{lens_dir}/foo.aug") } @@ -91,16 +91,16 @@ describe 'augeas::lens' do } end - let(:pre_condition) do - "class { '::augeas': version => '1.3.0' }" + let(:facts) do + super().merge({ + :augeasversion => '1.3.0', + }) end it do - pending "undefined method `negative_failure_message'" is_expected.not_to contain_file("#{lens_dir}/foo.aug") end it do - pending "undefined method `negative_failure_message'" is_expected.not_to contain_exec('Typecheck lens foo') end end -- cgit v1.2.3 From 205ada2c7379efd1bdfc4bd3a4d0b7bee11bcad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 27 May 2016 09:09:21 +0200 Subject: Revert "r-p-f now sets rubyversion" This reverts commit 9a88fbdf3e437bf5671bbc54ebf5031af24421c0. --- spec/classes/augeas_spec.rb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb index 5ee8df4..16f76f4 100644 --- a/spec/classes/augeas_spec.rb +++ b/spec/classes/augeas_spec.rb @@ -37,11 +37,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => 'present', :name => 'libaugeas-ruby1.9.1' @@ -100,11 +110,21 @@ describe 'augeas' do ) } case facts[:lsbdistcodename] when 'squeeze', 'lucid', 'precise' + let(:facts) do + super().merge({ + :rubyversion => '1.8.7', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.8' ) } else + let(:facts) do + super().merge({ + :rubyversion => '1.9.3', + }) + end it { is_expected.to contain_package('ruby-augeas').with( :ensure => '3.2.1', :name => 'libaugeas-ruby1.9.1' -- cgit v1.2.3 From a4b13faa5437e60e3cf265e3cf82a482c62bd7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 20 Jun 2016 18:00:53 +0200 Subject: Update with modulesync --- Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index df5a5e3..947cd8b 100644 --- a/Gemfile +++ b/Gemfile @@ -25,10 +25,11 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'beaker_spec_helper', :require => false - gem 'serverspec', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'beaker_spec_helper', :require => false + gem 'serverspec', :require => false + gem 'specinfra', '2.59.0', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] -- cgit v1.2.3 From 20856086b4c2b451e423a2cb8e4c8dd2cfe9c9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Mon, 20 Jun 2016 18:00:54 +0200 Subject: Release version 1.4.3 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 8ef25d2..3d974a0 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.4.2", + "version": "1.4.3", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 6450241794803aa0f18d60edc511b93337ffd0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 11 Jul 2016 14:47:07 +0200 Subject: Add augeas PPA for travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5fdc1c7..06e0cae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,8 @@ addons: apt: packages: - libaugeas-dev + sources: + - augeas cache: bundler bundler_args: --without system_tests script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"] -- cgit v1.2.3 From d143a43ffbc834f281943949e1a20a0ba00ede42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 11 Jul 2016 14:48:50 +0200 Subject: modulesync --- .travis.yml | 2 -- Gemfile | 14 +++++++------- Rakefile | 6 ------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06e0cae..5b64f69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,6 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake matrix: fast_finish: true include: - - rvm: 1.8.7 - env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 3.0" - rvm: 2.0.0 diff --git a/Gemfile b/Gemfile index 947cd8b..1c22776 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do - gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/ - gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/ + gem 'rake', :require => false + gem 'rspec', :require => false gem 'rspec-puppet', :require => false gem 'puppetlabs_spec_helper', :require => false gem 'metadata-json-lint', :require => false @@ -25,11 +25,11 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'beaker_spec_helper', :require => false - gem 'serverspec', :require => false - gem 'specinfra', '2.59.0', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', :require => false + gem 'beaker_spec_helper', :require => false + gem 'serverspec', :require => false + gem 'specinfra', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/Rakefile b/Rakefile index 61faa29..ab65ceb 100644 --- a/Rakefile +++ b/Rakefile @@ -14,10 +14,4 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"] unless RUBY_VERSION =~ /^1\./ require 'puppet_blacksmith' require 'puppet_blacksmith/rake_tasks' - #require 'github_changelog_generator/task' - #GitHubChangelogGenerator::RakeTask.new :changelog do |config| - # m = Blacksmith::Modulefile.new - # config.future_release = m.version - # config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s" - #end end -- cgit v1.2.3 From dc09c4eb2808f39d61e2ddd9ef6e7d67d73aad93 Mon Sep 17 00:00:00 2001 From: Jordi Clariana Date: Thu, 16 Apr 2015 12:03:55 +0200 Subject: Include augeas 'super' class when not declared. --- manifests/lens.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/lens.pp b/manifests/lens.pp index d6a3523..bda7a0c 100644 --- a/manifests/lens.pp +++ b/manifests/lens.pp @@ -30,9 +30,7 @@ define augeas::lens ( $test_source = undef, $stock_since = false, ) { - if !defined(Class['augeas']) { - fail('You must declare the augeas class before using augeas::lens') - } + include ::augeas if $lens_source != undef { if $lens_content != undef { -- cgit v1.2.3 From 108205b8915af54bcac8d6805c3d910759b2c063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 11 Jul 2016 15:01:53 +0200 Subject: Fix unit tests when augeas class is not included --- spec/defines/augeas_lens_spec.rb | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb index b74164b..0fa1358 100644 --- a/spec/defines/augeas_lens_spec.rb +++ b/spec/defines/augeas_lens_spec.rb @@ -3,26 +3,9 @@ require 'spec_helper' describe 'augeas::lens' do let (:title) { 'foo' } - context 'when not declaring augeas class first' do - let (:params) do - { - :lens_source => '/tmp/foo.aug', - } - end - - it 'should error' do - expect { is_expected.to compile }.to raise_error(/You must declare the augeas class/) - end - end - lens_dir = Puppet.version < '4.0.0' ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses' context 'when declaring augeas class first' do - - let(:pre_condition) do - "class { '::augeas': }" - end - on_supported_os.each do |os, facts| context "on #{os}" do let(:facts) do -- cgit v1.2.3 From ca53088564017d2a5b019caa8cc854d8817c9aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Aug 2016 10:39:06 +0200 Subject: Release 1.5.0 --- CHANGELOG.md | 5 +++++ metadata.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b52b1f..42194b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2016-08-18 - Release 1.5.0 + +- Use Augeas PPA for Travis CI tests +- Include augeas 'super' class when not declared (fix #93) + ## 2015-09-09 - Release 1.4.2 Fix for puppet AIO packaging diff --git a/metadata.json b/metadata.json index 3d974a0..9346921 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.4.3", + "version": "1.5.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 4780efbff9ea898ff1c88f4a6c3b520396e564d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Aug 2016 11:02:48 +0200 Subject: modulesync --- .puppet-lint.rc | 2 +- .travis.yml | 2 +- Gemfile | 1 + Rakefile | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.puppet-lint.rc b/.puppet-lint.rc index d8f5c59..e09d52f 100644 --- a/.puppet-lint.rc +++ b/.puppet-lint.rc @@ -1,5 +1,5 @@ --fail-on-warnings --relative ---no-80chars +--no-140chars --no-documentation --no-class_inherits_from_params_class-check diff --git a/.travis.yml b/.travis.yml index 5b64f69..25f723f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - rvm: 2.1.7 - env: PUPPET_GEM_VERSION="~> 4.0" + env: PUPPET_GEM_VERSION="~> 4.5.0" notifications: email: false deploy: diff --git a/Gemfile b/Gemfile index 1c22776..c2dabee 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ group :development, :unit_tests do gem 'rspec-puppet-facts', :require => false gem 'ruby-augeas', :require => false gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./ + gem 'json_pure', '< 2.0.2', :require => false end group :system_tests do diff --git a/Rakefile b/Rakefile index ab65ceb..aa7b8a1 100644 --- a/Rakefile +++ b/Rakefile @@ -4,7 +4,7 @@ require 'puppet-lint/tasks/puppet-lint' Rake::Task[:lint].clear PuppetLint::RakeTask.new :lint do |config| config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"] - config.disable_checks = ['80chars'] + config.disable_checks = ['140chars'] config.fail_on_warnings = true end -- cgit v1.2.3 From 6dbacd719ecedc34d62ae9688a9416c4d8411524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 18 Aug 2016 11:07:20 +0200 Subject: Release 1.5.1 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42194b9..4158f1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2016-08-19 - Release 1.5.1 + +- Fix Travis CI tests + ## 2016-08-18 - Release 1.5.0 - Use Augeas PPA for Travis CI tests diff --git a/metadata.json b/metadata.json index 9346921..b5a5b81 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.5.0", + "version": "1.5.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 66d4612f0cb0e861fe2064510cc8f73d7bcc2574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 5 Jan 2017 11:02:54 +0100 Subject: Modulesync: remove Puppet 3 tests --- .travis.yml | 14 +++++--------- Gemfile | 11 +++++------ spec/acceptance/nodesets/centos-7.yml | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25f723f..3efa3ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,10 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake matrix: fast_finish: true include: - - rvm: 1.9.3 - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" - - rvm: 2.0.0 - env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes" - - rvm: 2.1.7 - env: PUPPET_GEM_VERSION="~> 4.5.0" + - rvm: 2.1.9 + env: PUPPET_GEM_VERSION="~> 4.0" + - rvm: 2.3.1 + env: PUPPET_GEM_VERSION="~> 4" notifications: email: false deploy: @@ -33,4 +29,4 @@ deploy: # all_branches is required to use tags all_branches: true # Only publish if our main Ruby target builds - rvm: 2.1.7 + rvm: 2.1.9 diff --git a/Gemfile b/Gemfile index c2dabee..377d0c1 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,6 @@ group :development, :unit_tests do gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false - gem 'puppet-lint-variable_contains_upcase', :require => false gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false @@ -26,11 +25,11 @@ group :development, :unit_tests do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'beaker_spec_helper', :require => false - gem 'serverspec', :require => false - gem 'specinfra', :require => false + gem 'beaker', :require => false + gem 'beaker-rspec', '> 5', :require => false + gem 'beaker_spec_helper', :require => false + gem 'serverspec', :require => false + gem 'specinfra', :require => false end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml index bc57539..a8fa468 100644 --- a/spec/acceptance/nodesets/centos-7.yml +++ b/spec/acceptance/nodesets/centos-7.yml @@ -9,7 +9,7 @@ HOSTS: docker_preserve_image: true docker_cmd: '["/usr/sbin/init"]' docker_image_commands: - - 'yum install -y crontabs tar wget' + - 'yum install -y crontabs tar wget iproute' CONFIG: type: aio log_level: debug -- cgit v1.2.3 From a2f98c752f3d661517a278290dfc47e4919efbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 9 Jan 2017 09:20:32 +0100 Subject: Require Puppet 4.x --- metadata.json | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/metadata.json b/metadata.json index b5a5b81..788d42f 100644 --- a/metadata.json +++ b/metadata.json @@ -17,11 +17,11 @@ "requirements": [ { "name": "pe", - "version_requirement": "3.x" + "version_requirement": "4.x" }, { "name": "puppet", - "version_requirement": "3.x" + "version_requirement": "4.x" } ], "operatingsystem_support": [ @@ -54,16 +54,5 @@ "2015.03" ] } - ], - "puppet_version": [ - "2.7", - "3.0", - "3.1", - "3.2", - "3.3", - "3.4", - "3.5", - "3.6", - "3.7" ] } -- cgit v1.2.3 From f85739b318de4229c991786fdfa092b4d5990a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 9 Jan 2017 09:21:15 +0100 Subject: Release 1.6.0 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4158f1b..79bbae8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2017-01-09 - Release 1.6.0 + +- Deprecate Puppet 2 and 3 + ## 2016-08-19 - Release 1.5.1 - Fix Travis CI tests diff --git a/metadata.json b/metadata.json index 788d42f..12c2b2e 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.5.1", + "version": "1.6.0", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3 From 952660f24a37781400df9433e5597e102349415a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 31 Mar 2017 16:19:04 +0200 Subject: Lint with puppet-lint --- manifests/init.pp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1257894..94e50b9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,14 +17,14 @@ class augeas ( ) inherits augeas::params { if versioncmp($::puppetversion, '4.0.0') >= 0 { - anchor { 'augeas::begin': } -> - class {'::augeas::files': } -> - anchor { 'augeas::end': } + anchor { 'augeas::begin': } + -> class {'::augeas::files': } + -> anchor { 'augeas::end': } } else { - anchor { 'augeas::begin': } -> - class {'::augeas::packages': } -> - class {'::augeas::files': } -> - anchor { 'augeas::end': } + anchor { 'augeas::begin': } + -> class {'::augeas::packages': } + -> class {'::augeas::files': } + -> anchor { 'augeas::end': } # lint:ignore:spaceship_operator_without_tag Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> -- cgit v1.2.3 From f1bade54d969ac2869648639b8dd1326c0ca8815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 31 Mar 2017 16:44:41 +0200 Subject: Update with modulesync --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3efa3ba..70e0f15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,9 @@ script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake matrix: fast_finish: true include: - - rvm: 2.1.9 + - rvm: 2.1.10 env: PUPPET_GEM_VERSION="~> 4.0" - - rvm: 2.3.1 + - rvm: 2.3.4 env: PUPPET_GEM_VERSION="~> 4" notifications: email: false -- cgit v1.2.3 From f0faa776b9cd8c9cfbe16651de2fce6b37df4dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 31 Mar 2017 16:44:44 +0200 Subject: Release version 1.6.1 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 12c2b2e..a535ed6 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "camptocamp-augeas", - "version": "1.6.0", + "version": "1.6.1", "author": "camptocamp", "summary": "Camptocamp Augeas module", "license": "Apache-2.0", -- cgit v1.2.3