r10k 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d62476d0519cfbe568f8ecf926066731d9f7e20f
-  data.tar.gz: 40d790eba434595f2f46463df01db7911303ca1d
+  metadata.gz: 1751a994285442b34b30d2274ed0049c242ad7b4
+  data.tar.gz: bea09a73ff5954f2f434ab018c307f3efc59e420
 SHA512:
-  metadata.gz: d7d3f98e6d3f91891c512aeead3f542cb22d6f2dd8ebcf99f741241806d57134756a389f333d819afc4c01c3e989a284d5bc8ddf756a406e220ff5d67fca1323
-  data.tar.gz: 726198f1d46c074b27a6ab0b187cb7667133706b394f75fd72ce9506e671842a235bf48b87859b6bc0a864974f9f51e144bb4aa198ed6ced0752673ebd6fb739
+  metadata.gz: 727021b3144cdf93ccadb11c9718ceccc2f054bc310614fdec5881e1ae704b65b50a385ceed17f68b446cc31ee5ed5bdd194c7c3ae66bf1183c0fd17de55b10d
+  data.tar.gz: 9975f54ffa36bdbd0a5c27d0478fca297f95a151a957b931fc12749f5d0fe62c5655afa3979f03bf6c4ea09cc0cd31dc40c4b7ed85caa1ecd63e3a0a990c7737

data/CHANGELOG.mkd

@@ -1,6 +1,23 @@
 CHANGELOG
 =========
 
+2.5.5
+-----
+
+2017/06/02
+
+### Bug Fixes
+
+(#696) Move deprecated module check to install/reinstall/upgrade rather than
+synchronize. This fixes a major slowdown on redeployment.
+
+### Changes
+
+(RK-290) Add deprecation warning for duplicate module names in Puppetfile. This
+will cause an error in r10k v3.0.0.
+
+(RK-285) Update minitar dependency to 0.6.1
+
 2.5.4
 -----
 

data/integration/Gemfile

@@ -1,5 +1,6 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gem 'beaker', '~> 2.7'
+gem 'beaker-abs', '~> 0.2'
 gem 'rototiller', '= 0.1.0'
 gem 'beaker-hostgenerator', '~> 0.7.0'

data/integration/Rakefile

@@ -1,21 +1,52 @@
 require 'rototiller'
 
+namespace :ci do
+  namespace :test do
+
+    desc 'Tests at the component level for the pe-r10k project'
+    task :component => [:check_pe_r10k_env_vars] do
+      Rake::Task[:beaker].invoke
+    end
+  end
+end
+
+desc 'Run tests against a packaged PE build'
+task :acceptance do
+  @acceptance_pre_suite = 'pre-suite'
+  Rake::Task[:beaker].invoke
+end
+
 desc 'The acceptance tests for r10k, run in the beaker framework'
-rototiller_task :acceptance => [:beaker_hostgenerator] do |t|
+rototiller_task :beaker => [:beaker_hostgenerator] do |t|
+
+  common_setup = <<-EOS
+pre-suite/00_pe_install.rb,
+component/pre-suite/05_install_dev_r10k.rb,
+pre-suite/10_git_config.rb,
+pre-suite/20_pe_r10k.rb,
+pre-suite/30_test_utils.rb,
+EOS
+  common_setup.gsub!("\n", '')
 
   flags = [
       {:name => '--hosts', :default => 'configs/generated', :override_env => 'BEAKER_HOST'},
       {:name => '--keyfile', :default => "#{ENV['HOME']}/.ssh/id_rsa-acceptance", :override_env => 'BEAKER_KEYFILE'},
       {:name => '--load-path', :default => 'lib'},
-      {:name => '--pre-suite', :default => 'pre-suite'},
+      {:name => '--pre-suite', :default => @acceptance_pre_suite || common_setup, :override_env => 'BEAKER_PRE_SUITE'},
       {:name => '--tests', :default => 'tests', :override_env => 'BEAKER_TESTS'},
       {:name => '--preserve-hosts', :default => 'onfail', :override_env => 'BEAKER_PRESERVE_HOSTS'},
   ]
   t.add_flag(*flags)
 
   t.add_env do |env|
-    env.name = 'BEAKER_PE_DIR'
-    env.message = 'The location to download PE from example "http://neptune.puppetlabs.lan/2016.2/ci-ready"'
+    env.name = 'PE_FAMILY'
+    env.message = 'The puppet enterprise major branch to install from'
+  end
+
+  t.add_env do |env|
+    env.name = 'pe_dist_dir'
+    env.message = 'The location to download PE from example "http://enterprise.delivery.puppetlabs.net/20XX.X/ci-ready"'
+    ENV['pe_dist_dir'] ||= "http://enterprise.delivery.puppetlabs.net/#{ENV['PE_FAMILY']}/ci-ready"
   end
 
   t.add_env do |env|
@@ -28,14 +59,20 @@ end
 
 desc 'Generate a host configuration used by Beaker'
 rototiller_task :beaker_hostgenerator do |t|
+  if ENV['BEAKER_HOST'].nil?
+    t.add_command do |c|
+      c.name = 'beaker-hostgenerator'
+      c.argument = '> configs/generated'
+    end
 
-  t.add_command do |c|
-    c.name = 'beaker-hostgenerator'
-    c.argument = '> configs/generated'
-  end
+    # This is a hack :(
+    t.add_flag(:name => '', :default => 'centos6-64mdca-64.fa', :override_env => 'TEST_TARGET')
 
-  #this is a hack :(
-  t.add_flag(:name => '', :default => 'centos6-64mdca-64.fa', :override_env => 'TEST_TARGET')
+    t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+  end
+end
 
-  t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+rototiller_task :check_pe_r10k_env_vars do |t|
+  t.add_env(:name => 'SHA', :message => 'The sha for pe-r10k')
 end
+

data/integration/component/pre-suite/05_install_dev_r10k.rb

@@ -0,0 +1,10 @@
+test_name "Install PE r10k" do
+
+  step "Install PE r10k" do
+
+    # taken from beaker-pe/lib/beaker-pe/pe-client-tools/install_helper.rb
+    install_dev_repos_on('pe-r10k', master, ENV['SHA'], '/tmp/repo_configs', {:dev_builds_url => 'http://builds.delivery.puppetlabs.net'})
+    master.install_package('pe-r10k')
+
+  end
+end

data/lib/r10k/module/forge.rb

@@ -43,10 +43,6 @@ class R10K::Module::Forge < R10K::Module::Base
   end
 
   def sync(opts={})
-    if deprecated?
-      logger.warn "Puppet Forge module '#{@v3_module.slug}' has been deprecated, visit https://forge.puppet.com/#{@v3_module.slug.tr('-','/')} for more information."
-    end
-
     case status
     when :absent
       install
@@ -141,6 +137,10 @@ class R10K::Module::Forge < R10K::Module::Base
   end
 
   def install
+    if deprecated?
+      logger.warn "Puppet Forge module '#{@v3_module.slug}' has been deprecated, visit https://forge.puppet.com/#{@v3_module.slug.tr('-','/')} for more information."
+    end
+
     parent_path = @path.parent
     if !parent_path.exist?
       parent_path.mkpath

data/lib/r10k/puppetfile.rb

@@ -59,6 +59,7 @@ class Puppetfile
   def load!
     dsl = R10K::Puppetfile::DSL.new(self)
     dsl.instance_eval(puppetfile_contents, @puppetfile_path)
+    validate_no_duplicate_names(@modules)
     @loaded = true
   rescue SyntaxError, LoadError, ArgumentError => e
     raise R10K::Error.wrap(e, _("Failed to evaluate %{path}") % {path: @puppetfile_path})
@@ -69,6 +70,17 @@ class Puppetfile
     @forge = forge
   end
 
+  # @param [Array<String>] modules
+  def validate_no_duplicate_names(modules)
+    dupes = modules
+            .group_by { |mod| mod.name }
+            .select { |_, v| v.size > 1 }.map(&:first)
+    unless dupes.empty?
+      logger.warn _('Puppetfiles should not contain duplicate module names and will result in an error in r10k v3.x.')
+      logger.warn _("Remove the duplicates of the following modules: %{dupes}" % {dupes: dupes.join(" ")})
+    end
+  end
+
   # @param [String] moduledir
   def set_moduledir(moduledir)
     @moduledir = if Pathname.new(moduledir).absolute?

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.5.4'
+  VERSION = '2.5.5'
 end

data/r10k.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'puppet_forge', '~> 2.2'
   s.add_dependency 'semantic_puppet', '~> 0.1.0'
-  s.add_dependency 'minitar', '0.5.4'
 
   s.add_dependency 'gettext-setup', '~> 0.5'
 
@@ -39,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
 
   s.add_development_dependency 'yard', '~> 0.8.7.3'
+  s.add_development_dependency 'minitar', '~> 0.6.1'
 
   s.files        = %x[git ls-files].split($/)
   s.require_path = 'lib'

data/spec/unit/module/forge_spec.rb

@@ -63,8 +63,10 @@ describe R10K::Module::Forge do
   context "when a module is deprecated" do
     subject { described_class.new('puppetlabs/corosync', fixture_modulepath, :latest) }
 
-    it "warns on sync" do
-      allow(subject).to receive(:install)
+    it "warns on sync if module is not already insync" do
+      allow(subject).to receive(:status).and_return(:absent)
+
+      allow(R10K::Forge::ModuleRelease).to receive(:new).and_return(double('mod_release', install: true))
 
       logger_dbl = double(Log4r::Logger)
       allow_any_instance_of(described_class).to receive(:logger).and_return(logger_dbl)
@@ -73,6 +75,17 @@ describe R10K::Module::Forge do
 
       subject.sync
     end
+
+    it "does not warn on sync if module is already insync" do
+      allow(subject).to receive(:status).and_return(:insync)
+
+      logger_dbl = double(Log4r::Logger)
+      allow_any_instance_of(described_class).to receive(:logger).and_return(logger_dbl)
+
+      expect(logger_dbl).to_not receive(:warn).with(/puppet forge module.*puppetlabs-corosync.*has been deprecated/i)
+
+      subject.sync
+    end
   end
 
   describe '#expected_version' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: gettext-setup
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.3
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: |2
       R10K provides a general purpose toolset for deploying Puppet environments and modules.
       It implements the Puppetfile format and provides a native implementation of Puppet
@@ -202,20 +202,7 @@ files:
 - integration/Gemfile
 - integration/README.mkd
 - integration/Rakefile
-- integration/configs/README.mkd
-- integration/configs/pe/centos-5-64mda
-- integration/configs/pe/centos-6-64mda
-- integration/configs/pe/centos-7-64mda
-- integration/configs/pe/debian-6-64mda
-- integration/configs/pe/debian-7-64mda
-- integration/configs/pe/redhat-6-64mda
-- integration/configs/pe/redhat-7-64mda
-- integration/configs/pe/sles-11-64mda
-- integration/configs/pe/sles-12-64mda
-- integration/configs/pe/ubuntu-1004-64mda
-- integration/configs/pe/ubuntu-1204-64mda
-- integration/configs/pe/ubuntu-1404-64mda
-- integration/configs/pe/ubuntu-1604-64mda
+- integration/component/pre-suite/05_install_dev_r10k.rb
 - integration/files/README.mkd
 - integration/files/hiera.yaml
 - integration/files/modules/helloworld/manifests/init.pp
@@ -231,9 +218,9 @@ files:
 - integration/lib/r10k_utils.rb
 - integration/manifests/README.mkd
 - integration/pre-suite/00_pe_install.rb
-- integration/pre-suite/01_git_config.rb
-- integration/pre-suite/02_pe_r10k.rb
-- integration/pre-suite/03_test_utils.rb
+- integration/pre-suite/10_git_config.rb
+- integration/pre-suite/20_pe_r10k.rb
+- integration/pre-suite/30_test_utils.rb
 - integration/pre-suite/README.mkd
 - integration/scripts/README.mkd
 - integration/scripts/setup_r10k_env_centos5.sh

data/integration/configs/README.mkd

@@ -1,7 +0,0 @@
-Config
-===========================
-
-This folder contains [Beaker](https://github.com/puppetlabs/beaker) configuration files. All of these
-configurations utilize the ["vmpooler"](https://github.com/puppetlabs/vmpooler) service for templates.
-These configurations are specific to the Puppet Labs environment and will not work in other environments without
-alteration!

data/integration/configs/pe/centos-5-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  centos-5-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: el-5-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
-    hypervisor: vcloud
-  centos-5-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: el-5-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-5-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/centos-6-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  centos-6-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: el-6-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64
-    hypervisor: vcloud
-  centos-6-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: el-6-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-6-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/centos-7-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  centos-7-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: el-7-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
-    hypervisor: vcloud
-  centos-7-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: el-7-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/centos-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/debian-6-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  debian-6-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: debian-6-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64
-    hypervisor: vcloud
-  debian-6-amd64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: debian-6-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/debian-6-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/debian-7-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  debian-7-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: debian-7-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64
-    hypervisor: vcloud
-  debian-7-amd64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: debian-7-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/debian-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/redhat-6-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  redhat-6-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: el-6-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64
-    hypervisor: vcloud
-  redhat-6-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: el-6-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/redhat-6-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/redhat-7-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  redhat-7-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: el-7-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64
-    hypervisor: vcloud
-  redhat-7-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: el-7-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/redhat-7-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/sles-11-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  sles-11-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: sles-11-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64
-    hypervisor: vcloud
-  sles-11-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: sles-11-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/sles-11-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/sles-12-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  sles-12-x86_64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: sles-12-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
-    hypervisor: vcloud
-  sles-12-x86_64-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: sles-12-x86_64
-    template: Delivery/Quality Assurance/Templates/vCloud/sles-12-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/ubuntu-1004-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  ubuntu-1004-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: ubuntu-10.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64
-    hypervisor: vcloud
-  ubuntu-1004-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: ubuntu-10.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1004-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/ubuntu-1204-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  ubuntu-1204-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: ubuntu-12.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
-    hypervisor: vcloud
-  ubuntu-1204-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: ubuntu-12.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1204-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/ubuntu-1404-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  ubuntu-1404-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: ubuntu-14.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
-    hypervisor: vcloud
-  ubuntu-1404-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: ubuntu-14.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1404-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com

data/integration/configs/pe/ubuntu-1604-64mda

@@ -1,25 +0,0 @@
-HOSTS:
-  ubuntu-1604-amd64-master:
-    roles:
-      - master
-      - dashboard
-      - database
-      - agent
-    platform: ubuntu-16.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
-    hypervisor: vcloud
-  ubuntu-1604-agent:
-    roles:
-      - agent
-      - frictionless
-    platform: ubuntu-16.04-amd64
-    template: Delivery/Quality Assurance/Templates/vCloud/ubuntu-1604-x86_64
-    hypervisor: vcloud
-CONFIG:
-  nfs_server: none
-  consoleport: 443
-  datastore: instance0
-  folder: Delivery/Quality Assurance/Enterprise/Dynamic
-  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
-  forge_host: forge-aio01-petest.puppetlabs.com