Skip to content

Commit 61112b7

Browse files
committed
Add Puppet 3.7+ support back into the module
1 parent 32811aa commit 61112b7

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.fixtures.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
fixtures:
22
repositories:
33
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
4-
mysql: "https://github.com/puppetlabs/puppetlabs-mysql.git"
5-
apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
4+
forge_modules:
5+
mysql:
6+
repo: 'puppetlabs-mysql'
7+
ref: '3.11.0'
8+
apt:
9+
repo: 'puppetlabs-apt'
10+
ref: '2.4.0'
611
symlinks:
712
powerdns: "#{source_dir}"

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ rvm:
99
- 2.1.0
1010
script: bundle exec rake test
1111
env:
12+
- PUPPET_VERSION="~> 3.7.0"
13+
- PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
1214
- PUPPET_VERSION="~> 4.5.0"
1315
- PUPPET_VERSION="~> 4.6.0"
1416
- PUPPET_VERSION="~> 4.7.0"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
22

3-
puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3']
3+
puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['~> 3.7.0']
44
gem 'facter', '>= 1.7.0'
55
gem 'puppet', puppetversion
66
gem 'puppet-lint', '>= 1.0.0'

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
"dependencies": [
1717
{ "name": "puppetlabs/stdlib", "version_requirement": ">=4.3.2 < 5.0.0" },
1818
{ "name": "puppetlabs/mysql", "version_requirement": ">=3.4.0 < 4.0.0" },
19-
{ "name": "puppetlabs/apt", "version_requirement": ">=2.0.0 < 4.0.0" }
19+
{ "name": "puppetlabs/apt", "version_requirement": ">=2.0.0 < 3.0.0" }
2020
]
2121
}

0 commit comments

Comments
 (0)