From d2da01f592146e9a56c0effe685a8995923fec89 Mon Sep 17 00:00:00 2001 From: Brandon Weeks Date: Tue, 2 Feb 2016 19:12:48 -0800 Subject: [PATCH] Bump allowed version of puppetlabs-concat This change allows version 2.x of puppetlabs-concat as a dependency. The module has been refactored as a resource type to improve reliability and performance. Change-Id: I0bac8e5ebd93d5fec804b8641fabcc83916de934 --- .fixtures.yml | 2 +- metadata.json | 2 +- spec/spec_helper_acceptance.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 199faa13..6a6786fc 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -10,7 +10,7 @@ fixtures: ref: '1.4.1' 'concat': repo: 'git://github.com/puppetlabs/puppetlabs-concat' - ref: '1.2.1' + ref: '2.1.0' symlinks: 'ceph': "#{source_dir}" diff --git a/metadata.json b/metadata.json index 4f70061d..9c052f6f 100644 --- a/metadata.json +++ b/metadata.json @@ -33,7 +33,7 @@ "dependencies": [ { "name": "puppetlabs/apt", "version_requirement": ">=2.0.0 <3.0.0" }, { "name": "puppetlabs/apache", "version_requirement": ">=1.4.1 <2.0.0" }, - { "name": "puppetlabs/concat", "version_requirement": ">=1.2.1 <2.0.0" }, + { "name": "puppetlabs/concat", "version_requirement": ">=1.2.1 <3.0.0" }, { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" } ] diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index c0b6ce70..2501a756 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -43,7 +43,7 @@ RSpec.configure do |c| on host, puppet('module install puppetlabs/stdlib --version ">=4.0.0 <5.0.0"'), { :acceptable_exit_codes => [0,1] } on host, puppet('module install puppetlabs/inifile --version ">=1.0.0 <2.0.0"'), { :acceptable_exit_codes => [0,1] } on host, puppet('module install puppetlabs/apt --version ">=2.0.0 <3.0.0"'), { :acceptable_exit_codes => [0,1] } - on host, puppet('module install puppetlabs/concat --version ">=1.2.1 <2.0.0"'), { :acceptable_exit_codes => [0,1] } + on host, puppet('module install puppetlabs/concat --version ">=1.2.1 <3.0.0"'), { :acceptable_exit_codes => [0,1] } on host, puppet('module install puppetlabs/apache --version ">=1.4.1 <2.0.0"'), { :acceptable_exit_codes => [0,1] } on host, puppet('module install stackforge/keystone --version ">=5.1.0 <6.0.0"'), { :acceptable_exit_codes => [0,1] } # keystone >=5.1.0 <6.0.0 is not present in openstack/keystone puppet_module_install(:source => proj_root, :module_name => 'ceph')