Skip to content

Commit f99a3fa

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 e6c3f53 commit f99a3fa

File tree

8 files changed

+75
-26
lines changed

8 files changed

+75
-26
lines changed

.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#This file is generated by ModuleSync, do not edit.
2+
*.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

@@ -21,29 +23,18 @@ group :development, :unit_tests do
2123
gem 'rspec-puppet-facts', :require => false
2224
end
2325
group :system_tests do
26+
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
27+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'])
28+
gem 'serverspec', :require => false
2429
gem 'beaker-puppet_install_helper', :require => false
25-
if beaker_version = ENV['BEAKER_VERSION']
26-
gem 'beaker', *location_for(beaker_version)
27-
end
28-
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
29-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
30-
else
31-
gem 'beaker-rspec', :require => false
32-
end
3330
gem 'master_manipulator', :require => false
34-
gem 'serverspec', :require => false
31+
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
3532
end
3633

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

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

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

LICENSE

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
Apache License
23
Version 2.0, January 2004
34
http://www.apache.org/licenses/
@@ -180,13 +181,13 @@
180181
To apply the Apache License to your work, attach the following
181182
boilerplate notice, with the fields enclosed by brackets "[]"
182183
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184+
the brackets!) The text should be enclosed in the appropriate
184185
comment syntax for the file format. We also recommend that a
185186
file or class name and description of purpose be included on the
186187
same "printed page" as the copyright notice for easier
187188
identification within third-party archives.
188189

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

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

NOTICE

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
mysql puppet module
2+
3+
Copyright (C) 2013-2016 Puppet Labs, Inc.
4+
5+
Puppet Labs can be contacted at: [email protected]
6+
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
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)