Merge pull request #686 from enovance/puppet3.2
Re-introduce puppet 3.2 checks and update puppet-nfs refs
This commit is contained in:
commit
b52696c685
@ -155,7 +155,7 @@ fixtures:
|
||||
ref: '7122983d89bf68bc4170415cc03212f6a8a4636e'
|
||||
'nfs':
|
||||
repo: 'git://github.com/enovance/puppet-module-nfs.git'
|
||||
ref: '41ed7bda5ab385df6c27080d65d71ce0ba5decd2'
|
||||
ref: 'a806082ba5ed50fb6ed3c1a9791207e3a9189574'
|
||||
'common':
|
||||
repo: 'git://github.com/enovance/puppet-module-common.git'
|
||||
ref: '2d0606fce1078222dd483e731ec32807f5b4ca53'
|
||||
|
@ -5,6 +5,7 @@ rvm:
|
||||
- 2.0.0
|
||||
env:
|
||||
matrix:
|
||||
- PUPPET_GEM_VERSION="~> 3.2.0"
|
||||
- PUPPET_GEM_VERSION="~> 3.6.0"
|
||||
- PUPPET_GEM_VERSION="~> 3.7.0"
|
||||
notifications:
|
||||
|
@ -138,7 +138,7 @@ mod 'mysql',
|
||||
# https://github.com/ghoneycutt/puppet-module-nfs/pull/43 got merged.
|
||||
mod 'nfs',
|
||||
:git => 'git://github.com/enovance/puppet-module-nfs.git',
|
||||
:ref => '41ed7bda5ab385df6c27080d65d71ce0ba5decd2'
|
||||
:ref => 'a806082ba5ed50fb6ed3c1a9791207e3a9189574'
|
||||
mod 'ntp',
|
||||
:git => 'git://github.com/enovance/puppetlabs-ntp.git',
|
||||
:ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d'
|
||||
|
@ -14,7 +14,7 @@
|
||||
{"operatingsystem": "RedHat"}
|
||||
],
|
||||
"requirements": [
|
||||
{"name": "pe","version_requirement": "3.6.x"},
|
||||
{"name": "pe","version_requirement": "3.2.x"},
|
||||
{"name": "puppet","version_requirement": "3.x"}
|
||||
],
|
||||
"description": "Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack",
|
||||
|
Loading…
x
Reference in New Issue
Block a user