r10k 2.5.4 → 2.5.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d62476d0519cfbe568f8ecf926066731d9f7e20f
4
- data.tar.gz: 40d790eba434595f2f46463df01db7911303ca1d
3
+ metadata.gz: 1751a994285442b34b30d2274ed0049c242ad7b4
4
+ data.tar.gz: bea09a73ff5954f2f434ab018c307f3efc59e420
5
5
  SHA512:
6
- metadata.gz: d7d3f98e6d3f91891c512aeead3f542cb22d6f2dd8ebcf99f741241806d57134756a389f333d819afc4c01c3e989a284d5bc8ddf756a406e220ff5d67fca1323
7
- data.tar.gz: 726198f1d46c074b27a6ab0b187cb7667133706b394f75fd72ce9506e671842a235bf48b87859b6bc0a864974f9f51e144bb4aa198ed6ced0752673ebd6fb739
6
+ metadata.gz: 727021b3144cdf93ccadb11c9718ceccc2f054bc310614fdec5881e1ae704b65b50a385ceed17f68b446cc31ee5ed5bdd194c7c3ae66bf1183c0fd17de55b10d
7
+ data.tar.gz: 9975f54ffa36bdbd0a5c27d0478fca297f95a151a957b931fc12749f5d0fe62c5655afa3979f03bf6c4ea09cc0cd31dc40c4b7ed85caa1ecd63e3a0a990c7737
@@ -1,6 +1,23 @@
1
1
  CHANGELOG
2
2
  =========
3
3
 
4
+ 2.5.5
5
+ -----
6
+
7
+ 2017/06/02
8
+
9
+ ### Bug Fixes
10
+
11
+ (#696) Move deprecated module check to install/reinstall/upgrade rather than
12
+ synchronize. This fixes a major slowdown on redeployment.
13
+
14
+ ### Changes
15
+
16
+ (RK-290) Add deprecation warning for duplicate module names in Puppetfile. This
17
+ will cause an error in r10k v3.0.0.
18
+
19
+ (RK-285) Update minitar dependency to 0.6.1
20
+
4
21
  2.5.4
5
22
  -----
6
23
 
@@ -1,5 +1,6 @@
1
1
  source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2
2
 
3
3
  gem 'beaker', '~> 2.7'
4
+ gem 'beaker-abs', '~> 0.2'
4
5
  gem 'rototiller', '= 0.1.0'
5
6
  gem 'beaker-hostgenerator', '~> 0.7.0'
@@ -1,21 +1,52 @@
1
1
  require 'rototiller'
2
2
 
3
+ namespace :ci do
4
+ namespace :test do
5
+
6
+ desc 'Tests at the component level for the pe-r10k project'
7
+ task :component => [:check_pe_r10k_env_vars] do
8
+ Rake::Task[:beaker].invoke
9
+ end
10
+ end
11
+ end
12
+
13
+ desc 'Run tests against a packaged PE build'
14
+ task :acceptance do
15
+ @acceptance_pre_suite = 'pre-suite'
16
+ Rake::Task[:beaker].invoke
17
+ end
18
+
3
19
  desc 'The acceptance tests for r10k, run in the beaker framework'
4
- rototiller_task :acceptance => [:beaker_hostgenerator] do |t|
20
+ rototiller_task :beaker => [:beaker_hostgenerator] do |t|
21
+
22
+ common_setup = <<-EOS
23
+ pre-suite/00_pe_install.rb,
24
+ component/pre-suite/05_install_dev_r10k.rb,
25
+ pre-suite/10_git_config.rb,
26
+ pre-suite/20_pe_r10k.rb,
27
+ pre-suite/30_test_utils.rb,
28
+ EOS
29
+ common_setup.gsub!("\n", '')
5
30
 
6
31
  flags = [
7
32
  {:name => '--hosts', :default => 'configs/generated', :override_env => 'BEAKER_HOST'},
8
33
  {:name => '--keyfile', :default => "#{ENV['HOME']}/.ssh/id_rsa-acceptance", :override_env => 'BEAKER_KEYFILE'},
9
34
  {:name => '--load-path', :default => 'lib'},
10
- {:name => '--pre-suite', :default => 'pre-suite'},
35
+ {:name => '--pre-suite', :default => @acceptance_pre_suite || common_setup, :override_env => 'BEAKER_PRE_SUITE'},
11
36
  {:name => '--tests', :default => 'tests', :override_env => 'BEAKER_TESTS'},
12
37
  {:name => '--preserve-hosts', :default => 'onfail', :override_env => 'BEAKER_PRESERVE_HOSTS'},
13
38
  ]
14
39
  t.add_flag(*flags)
15
40
 
16
41
  t.add_env do |env|
17
- env.name = 'BEAKER_PE_DIR'
18
- env.message = 'The location to download PE from example "http://neptune.puppetlabs.lan/2016.2/ci-ready"'
42
+ env.name = 'PE_FAMILY'
43
+ env.message = 'The puppet enterprise major branch to install from'
44
+ end
45
+
46
+ t.add_env do |env|
47
+ env.name = 'pe_dist_dir'
48
+ env.message = 'The location to download PE from example "http://enterprise.delivery.puppetlabs.net/20XX.X/ci-ready"'
49
+ ENV['pe_dist_dir'] ||= "http://enterprise.delivery.puppetlabs.net/#{ENV['PE_FAMILY']}/ci-ready"
19
50
  end
20
51
 
21
52
  t.add_env do |env|
@@ -28,14 +59,20 @@ end
28
59
 
29
60
  desc 'Generate a host configuration used by Beaker'
30
61
  rototiller_task :beaker_hostgenerator do |t|
62
+ if ENV['BEAKER_HOST'].nil?
63
+ t.add_command do |c|
64
+ c.name = 'beaker-hostgenerator'
65
+ c.argument = '> configs/generated'
66
+ end
31
67
 
32
- t.add_command do |c|
33
- c.name = 'beaker-hostgenerator'
34
- c.argument = '> configs/generated'
35
- end
68
+ # This is a hack :(
69
+ t.add_flag(:name => '', :default => 'centos6-64mdca-64.fa', :override_env => 'TEST_TARGET')
36
70
 
37
- #this is a hack :(
38
- t.add_flag(:name => '', :default => 'centos6-64mdca-64.fa', :override_env => 'TEST_TARGET')
71
+ t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
72
+ end
73
+ end
39
74
 
40
- t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
75
+ rototiller_task :check_pe_r10k_env_vars do |t|
76
+ t.add_env(:name => 'SHA', :message => 'The sha for pe-r10k')
41
77
  end
78
+
@@ -0,0 +1,10 @@
1
+ test_name "Install PE r10k" do
2
+
3
+ step "Install PE r10k" do
4
+
5
+ # taken from beaker-pe/lib/beaker-pe/pe-client-tools/install_helper.rb
6
+ install_dev_repos_on('pe-r10k', master, ENV['SHA'], '/tmp/repo_configs', {:dev_builds_url => 'http://builds.delivery.puppetlabs.net'})
7
+ master.install_package('pe-r10k')
8
+
9
+ end
10
+ end
@@ -43,10 +43,6 @@ class R10K::Module::Forge < R10K::Module::Base
43
43
  end
44
44
 
45
45
  def sync(opts={})
46
- if deprecated?
47
- logger.warn "Puppet Forge module '#{@v3_module.slug}' has been deprecated, visit https://forge.puppet.com/#{@v3_module.slug.tr('-','/')} for more information."
48
- end
49
-
50
46
  case status
51
47
  when :absent
52
48
  install
@@ -141,6 +137,10 @@ class R10K::Module::Forge < R10K::Module::Base
141
137
  end
142
138
 
143
139
  def install
140
+ if deprecated?
141
+ logger.warn "Puppet Forge module '#{@v3_module.slug}' has been deprecated, visit https://forge.puppet.com/#{@v3_module.slug.tr('-','/')} for more information."
142
+ end
143
+
144
144
  parent_path = @path.parent
145
145
  if !parent_path.exist?
146
146
  parent_path.mkpath
@@ -59,6 +59,7 @@ class Puppetfile
59
59
  def load!
60
60
  dsl = R10K::Puppetfile::DSL.new(self)
61
61
  dsl.instance_eval(puppetfile_contents, @puppetfile_path)
62
+ validate_no_duplicate_names(@modules)
62
63
  @loaded = true
63
64
  rescue SyntaxError, LoadError, ArgumentError => e
64
65
  raise R10K::Error.wrap(e, _("Failed to evaluate %{path}") % {path: @puppetfile_path})
@@ -69,6 +70,17 @@ class Puppetfile
69
70
  @forge = forge
70
71
  end
71
72
 
73
+ # @param [Array<String>] modules
74
+ def validate_no_duplicate_names(modules)
75
+ dupes = modules
76
+ .group_by { |mod| mod.name }
77
+ .select { |_, v| v.size > 1 }.map(&:first)
78
+ unless dupes.empty?
79
+ logger.warn _('Puppetfiles should not contain duplicate module names and will result in an error in r10k v3.x.')
80
+ logger.warn _("Remove the duplicates of the following modules: %{dupes}" % {dupes: dupes.join(" ")})
81
+ end
82
+ end
83
+
72
84
  # @param [String] moduledir
73
85
  def set_moduledir(moduledir)
74
86
  @moduledir = if Pathname.new(moduledir).absolute?
@@ -1,3 +1,3 @@
1
1
  module R10K
2
- VERSION = '2.5.4'
2
+ VERSION = '2.5.5'
3
3
  end
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
30
30
 
31
31
  s.add_dependency 'puppet_forge', '~> 2.2'
32
32
  s.add_dependency 'semantic_puppet', '~> 0.1.0'
33
- s.add_dependency 'minitar', '0.5.4'
34
33
 
35
34
  s.add_dependency 'gettext-setup', '~> 0.5'
36
35
 
@@ -39,6 +38,7 @@ Gem::Specification.new do |s|
39
38
  s.add_development_dependency 'rake'
40
39
 
41
40
  s.add_development_dependency 'yard', '~> 0.8.7.3'
41
+ s.add_development_dependency 'minitar', '~> 0.6.1'
42
42
 
43
43
  s.files = %x[git ls-files].split($/)
44
44
  s.require_path = 'lib'
@@ -63,8 +63,10 @@ describe R10K::Module::Forge do
63
63
  context "when a module is deprecated" do
64
64
  subject { described_class.new('puppetlabs/corosync', fixture_modulepath, :latest) }
65
65
 
66
- it "warns on sync" do
67
- allow(subject).to receive(:install)
66
+ it "warns on sync if module is not already insync" do
67
+ allow(subject).to receive(:status).and_return(:absent)
68
+
69
+ allow(R10K::Forge::ModuleRelease).to receive(:new).and_return(double('mod_release', install: true))
68
70
 
69
71
  logger_dbl = double(Log4r::Logger)
70
72
  allow_any_instance_of(described_class).to receive(:logger).and_return(logger_dbl)
@@ -73,6 +75,17 @@ describe R10K::Module::Forge do
73
75
 
74
76
  subject.sync
75
77
  end
78
+
79
+ it "does not warn on sync if module is already insync" do
80
+ allow(subject).to receive(:status).and_return(:insync)
81
+
82
+ logger_dbl = double(Log4r::Logger)
83
+ allow_any_instance_of(described_class).to receive(:logger).and_return(logger_dbl)
84
+
85
+ expect(logger_dbl).to_not receive(:warn).with(/puppet forge module.*puppetlabs-corosync.*has been deprecated/i)
86
+
87
+ subject.sync
88
+ end
76
89
  end
77
90
 
78
91
  describe '#expected_version' do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: r10k
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.4
4
+ version: 2.5.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrien Thebo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-05 00:00:00.000000000 Z
11
+ date: 2017-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: colored
@@ -94,20 +94,6 @@ dependencies:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 0.1.0
97
- - !ruby/object:Gem::Dependency
98
- name: minitar
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - '='
102
- - !ruby/object:Gem::Version
103
- version: 0.5.4
104
- type: :runtime
105
- prerelease: false
106
- version_requirements: !ruby/object:Gem::Requirement
107
- requirements:
108
- - - '='
109
- - !ruby/object:Gem::Version
110
- version: 0.5.4
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: gettext-setup
113
99
  requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,20 @@ dependencies:
164
150
  - - "~>"
165
151
  - !ruby/object:Gem::Version
166
152
  version: 0.8.7.3
153
+ - !ruby/object:Gem::Dependency
154
+ name: minitar
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - "~>"
158
+ - !ruby/object:Gem::Version
159
+ version: 0.6.1
160
+ type: :development
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - "~>"
165
+ - !ruby/object:Gem::Version
166
+ version: 0.6.1
167
167
  description: |2
168
168
  R10K provides a general purpose toolset for deploying Puppet environments and modules.
169
169
  It implements the Puppetfile format and provides a native implementation of Puppet
@@ -202,20 +202,7 @@ files:
202
202
  - integration/Gemfile
203
203
  - integration/README.mkd
204
204
  - integration/Rakefile
205
- - integration/configs/README.mkd
206
- - integration/configs/pe/centos-5-64mda
207
- - integration/configs/pe/centos-6-64mda
208
- - integration/configs/pe/centos-7-64mda
209
- - integration/configs/pe/debian-6-64mda
210
- - integration/configs/pe/debian-7-64mda
211
- - integration/configs/pe/redhat-6-64mda
212
- - integration/configs/pe/redhat-7-64mda
213
- - integration/configs/pe/sles-11-64mda
214
- - integration/configs/pe/sles-12-64mda
215
- - integration/configs/pe/ubuntu-1004-64mda
216
- - integration/configs/pe/ubuntu-1204-64mda
217
- - integration/configs/pe/ubuntu-1404-64mda
218
- - integration/configs/pe/ubuntu-1604-64mda
205
+ - integration/component/pre-suite/05_install_dev_r10k.rb
219
206
  - integration/files/README.mkd
220
207
  - integration/files/hiera.yaml
221
208
  - integration/files/modules/helloworld/manifests/init.pp
@@ -231,9 +218,9 @@ files:
231
218
  - integration/lib/r10k_utils.rb
232
219
  - integration/manifests/README.mkd
233
220
  - integration/pre-suite/00_pe_install.rb
234
- - integration/pre-suite/01_git_config.rb
235
- - integration/pre-suite/02_pe_r10k.rb
236
- - integration/pre-suite/03_test_utils.rb
221
+ - integration/pre-suite/10_git_config.rb
222
+ - integration/pre-suite/20_pe_r10k.rb
223
+ - integration/pre-suite/30_test_utils.rb
237
224
  - integration/pre-suite/README.mkd
238
225
  - integration/scripts/README.mkd
239
226
  - integration/scripts/setup_r10k_env_centos5.sh
@@ -1,7 +0,0 @@
1
- Config
2
- ===========================
3
-
4
- This folder contains [Beaker](https://github.com/puppetlabs/beaker) configuration files. All of these
5
- configurations utilize the ["vmpooler"](https://github.com/puppetlabs/vmpooler) service for templates.
6
- These configurations are specific to the Puppet Labs environment and will not work in other environments without
7
- alteration!
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- centos-5-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: el-5-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
10
- hypervisor: vcloud
11
- centos-5-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: el-5-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- centos-6-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: el-6-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64
10
- hypervisor: vcloud
11
- centos-6-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: el-6-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- centos-7-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: el-7-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
10
- hypervisor: vcloud
11
- centos-7-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: el-7-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- debian-6-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: debian-6-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64
10
- hypervisor: vcloud
11
- debian-6-amd64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: debian-6-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- debian-7-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: debian-7-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64
10
- hypervisor: vcloud
11
- debian-7-amd64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: debian-7-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- redhat-6-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: el-6-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64
10
- hypervisor: vcloud
11
- redhat-6-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: el-6-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- redhat-7-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: el-7-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64
10
- hypervisor: vcloud
11
- redhat-7-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: el-7-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- sles-11-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: sles-11-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64
10
- hypervisor: vcloud
11
- sles-11-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: sles-11-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- sles-12-x86_64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: sles-12-x86_64
9
- template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
10
- hypervisor: vcloud
11
- sles-12-x86_64-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: sles-12-x86_64
16
- template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- ubuntu-1004-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: ubuntu-10.04-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64
10
- hypervisor: vcloud
11
- ubuntu-1004-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: ubuntu-10.04-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- ubuntu-1204-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: ubuntu-12.04-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
10
- hypervisor: vcloud
11
- ubuntu-1204-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: ubuntu-12.04-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- ubuntu-1404-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: ubuntu-14.04-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
10
- hypervisor: vcloud
11
- ubuntu-1404-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: ubuntu-14.04-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com
@@ -1,25 +0,0 @@
1
- HOSTS:
2
- ubuntu-1604-amd64-master:
3
- roles:
4
- - master
5
- - dashboard
6
- - database
7
- - agent
8
- platform: ubuntu-16.04-amd64
9
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
10
- hypervisor: vcloud
11
- ubuntu-1604-agent:
12
- roles:
13
- - agent
14
- - frictionless
15
- platform: ubuntu-16.04-amd64
16
- template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
17
- hypervisor: vcloud
18
- CONFIG:
19
- nfs_server: none
20
- consoleport: 443
21
- datastore: instance0
22
- folder: Delivery/Quality Assurance/Enterprise/Dynamic
23
- resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
24
- pooling_api: http://vmpooler.delivery.puppetlabs.net/
25
- forge_host: forge-aio01-petest.puppetlabs.com