Skip to content

Commit 8ce25cc

Browse files
committed
(FM-4046) Update to current msync configs [006831f]
This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license.
1 parent 0b24b26 commit 8ce25cc

8 files changed

+73
-30
lines changed

.gitattributes

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
*.sh eol=lf
1+
#This file is generated by ModuleSync, do not edit.
22
*.rb eol=lf
3+
*.erb eol=lf
4+
*.pp eol=lf
5+
*.sh eol=lf

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#This file is generated by ModuleSync, do not edit.
12
pkg/
23
Gemfile.lock
34
vendor/

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#This file is generated by ModuleSync, do not edit.
12
---
23
sudo: false
34
language: ruby

Gemfile

+15-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
#This file is generated by ModuleSync, do not edit.
2+
13
source ENV['GEM_SOURCE'] || "https://rubygems.org"
24

3-
def location_for(place, fake_version = nil)
5+
def location_for(place, version = nil)
46
if place =~ /^(git[:@][^#]*)#(.*)/
5-
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
7+
[version, { :git => $1, :branch => $2, :require => false}].compact
68
elsif place =~ /^file:\/\/(.*)/
7-
['>= 0', { :path => File.expand_path($1), :require => false }]
9+
['>= 0', { :path => File.expand_path($1), :require => false}]
810
else
9-
[place, { :require => false }]
11+
[place, version, { :require => false}].compact
1012
end
1113
end
1214

@@ -20,29 +22,18 @@ group :development, :unit_tests do
2022
gem 'simplecov', :require => false
2123
end
2224
group :system_tests do
25+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
26+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'])
27+
gem 'serverspec', :require => false
2328
gem 'beaker-puppet_install_helper', :require => false
24-
if beaker_version = ENV['BEAKER_VERSION']
25-
gem 'beaker', *location_for(beaker_version)
26-
end
27-
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
28-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
29-
else
30-
gem 'beaker-rspec', :require => false
31-
end
3229
gem 'master_manipulator', :require => false
33-
gem 'serverspec', :require => false
30+
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
3431
end
3532

36-
if facterversion = ENV['FACTER_GEM_VERSION']
37-
gem 'facter', facterversion, :require => false
38-
else
39-
gem 'facter', :require => false
40-
end
33+
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
34+
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
4135

42-
if puppetversion = ENV['PUPPET_GEM_VERSION']
43-
gem 'puppet', puppetversion, :require => false
44-
else
45-
gem 'puppet', :require => false
46-
end
4736

48-
# vim:ft=ruby
37+
if File.exists? "#{__FILE__}.local"
38+
eval(File.read("#{__FILE__}.local"), binding)
39+
end

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
same "printed page" as the copyright notice for easier
188188
identification within third-party archives.
189189

190-
Copyright 2013 Puppet Labs
190+
Copyright [yyyy] [name of copyright owner]
191191

192192
Licensed under the Apache License, Version 2.0 (the "License");
193193
you may not use this file except in compliance with the License.

NOTICE

+19-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Puppetlabs postgresql module
1+
postgresql puppet module
22

3-
Copyright 2012 Inkling Systems Inc
4-
Copyright 2012-2013 Puppet Labs Inc
5-
Copyright 2012-2013 Camptocamp SA.
3+
Copyright (C) 2012-2016 Puppet Labs, Inc.
4+
Copyright (C) 2012 Inkling Systems Inc
5+
Copyright (C) 2012-2013 Camptocamp SA.
66

77
This product includes software developed by:
88
The Puppet Labs Inc (http://www.puppetlabs.com/).
@@ -12,3 +12,18 @@ This product includes also software developed by:
1212

1313
This product includes also software developed by:
1414
Inkling Systems Inc (https://www.inkling.com/)
15+
16+
Puppet Labs can be contacted at: [email protected]
17+
18+
19+
Licensed under the Apache License, Version 2.0 (the "License");
20+
you may not use this file except in compliance with the License.
21+
You may obtain a copy of the License at
22+
23+
http://www.apache.org/licenses/LICENSE-2.0
24+
25+
Unless required by applicable law or agreed to in writing, software
26+
distributed under the License is distributed on an "AS IS" BASIS,
27+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
28+
See the License for the specific language governing permissions and
29+
limitations under the License.

Rakefile

+31
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,34 @@ PuppetLint.configuration.send('disable_class_inherits_from_params_class')
99
PuppetLint.configuration.send('disable_documentation')
1010
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
1111
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
12+
13+
desc 'Generate pooler nodesets'
14+
task :gen_nodeset do
15+
require 'beaker-hostgenerator'
16+
require 'securerandom'
17+
require 'fileutils'
18+
19+
agent_target = ENV['TEST_TARGET']
20+
if ! agent_target
21+
STDERR.puts 'TEST_TARGET environment variable is not set'
22+
STDERR.puts 'setting to default value of "redhat-64default."'
23+
agent_target = 'redhat-64default.'
24+
end
25+
26+
master_target = ENV['MASTER_TEST_TARGET']
27+
if ! master_target
28+
STDERR.puts 'MASTER_TEST_TARGET environment variable is not set'
29+
STDERR.puts 'setting to default value of "redhat7-64mdcl"'
30+
master_target = 'redhat7-64mdcl'
31+
end
32+
33+
targets = "#{master_target}-#{agent_target}"
34+
cli = BeakerHostGenerator::CLI.new([targets])
35+
nodeset_dir = "tmp/nodesets"
36+
nodeset = "#{nodeset_dir}/#{targets}-#{SecureRandom.uuid}.yaml"
37+
FileUtils.mkdir_p(nodeset_dir)
38+
File.open(nodeset, 'w') do |fh|
39+
fh.print(cli.execute)
40+
end
41+
puts nodeset
42+
end

spec/spec_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#This file is generated by ModuleSync, do not edit.
12
require 'puppetlabs_spec_helper/module_spec_helper'
23

34
# put local configuration and setup into spec_helper_local

0 commit comments

Comments
 (0)