From ee409aea5d8dee896fd5277466a2c417d1df71b6 Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 15 Oct 2014 23:15:41 +0200 Subject: [PATCH 1/2] Revert "Drop Puppet 3.2 support" This reverts commit 51d34b90a07c41f1b76caca7aaa8d07ccb473115. --- .travis.yml | 1 + metadata.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d62b8206..63976a54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/metadata.json b/metadata.json index 997a6254..3339359d 100644 --- a/metadata.json +++ b/metadata.json @@ -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", From 53d0001e6f334028d0002780fa509bf0cd87f82e Mon Sep 17 00:00:00 2001 From: Sebastien Badia Date: Wed, 15 Oct 2014 23:37:53 +0200 Subject: [PATCH 2/2] Update refs for puppet nfs module (remove last coma in operatingsystemrelease array) --- .fixtures.yml | 2 +- Puppetfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index fce315dd..fe641506 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -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' diff --git a/Puppetfile b/Puppetfile index 18e8c139..183ff796 100644 --- a/Puppetfile +++ b/Puppetfile @@ -139,7 +139,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'