openstack/puppet-ceph
Code Issues Proposed changes

Bump allowed version of puppetlabs-concat

Browse Source 
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
This commit is contained in:
Brandon Weeks
2016-02-02 19:12:48 -08:00
parent 998e023d8f
commit d2da01f592
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@@ -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}"

2
metadata.json
View File

@@ -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" }
]

2
spec/spec_helper_acceptance.rb
View File

@@ -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')