(PUP-9050) Upgrade old vcloud pooled instances to vmpooler

Beaker-vcloud dropped support for silently upgrading vcloud-pooled type hosts to vmpooler, so these host configurations have been upgraded to use vmpooler.
puppetlabs · Aug 9, 2018 · 9fd431d · 9fd431d
1 parent 80d56ad
commit 9fd431d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 35 deletions.
diff --git a/acceptance/README.md b/acceptance/README.md
@@ -5,7 +5,7 @@ Table of Contents
 -----------------
 
 * [General Notes](#general-notes)
-* [Running Tests on the vcloud](#running-tests-on-the-vcloud)
+* [Running Tests on the vcloud](#running-tests-on-the-vcloud) (now vmpooler)
 * [Running Tests on Vagrant Boxen](#running-tests-on-vagrant-boxen)
 
 General Notes
@@ -47,11 +47,12 @@ Beaker will install the following:
 
 This corresponds to installing facter and hiera stable from our internal mirror, while installing puppet SHA abcd from a git daemon on my local machine percival.  See below for details on setting up a local git daemon.
 
-Running Tests on the vcloud
+Running Tests on the vcloud (now vmpooler)
 ---------------------------
 
-In order to use the Puppet Labs vcloud, you'll need to be a Puppet Labs employee.
-Community members should see the [guide to running the tests on vagrant boxen](#running-tests-on-vagrant-boxen).
+Only applies to Pulletlabs employees. Community members should see the [guide to running the tests on vagrant boxen](#running-tests-on-vagrant-boxen).
+
+This hypervisor has been deprecated: we now use vmpooler. Hosts files have been upgraded as appropriate.
 
 ### Authentication
 

diff --git a/acceptance/config/nodes/aix-53-power.yaml b/acceptance/config/nodes/aix-53-power.yaml
@@ -4,7 +4,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   pe-aix-53-acceptance:
     roles:
@@ -13,7 +13,4 @@ HOSTS:
     hypervisor: none
     vmhostname: pe-aix-53-acceptance.delivery.puppetlabs.net 
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/aix-61-power.yaml b/acceptance/config/nodes/aix-61-power.yaml
@@ -4,7 +4,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   pe-aix-61-acceptance:
     roles:
@@ -13,7 +13,4 @@ HOSTS:
     hypervisor: none
     vmhostname: pe-aix-61-acceptance.delivery.puppetlabs.net
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/aix-71-power.yaml b/acceptance/config/nodes/aix-71-power.yaml
@@ -4,7 +4,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   pe-aix-71-acceptance:
     roles:
@@ -13,7 +13,4 @@ HOSTS:
     hypervisor: none
     vmhostname: pe-aix-71-acceptance.delivery.puppetlabs.net
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/gem.yaml b/acceptance/config/nodes/gem.yaml
@@ -5,29 +5,26 @@ HOSTS:
     - agent
     platform: windows-2012r2-64
     ruby_arch: x86
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: win-2012r2-x86_64
   win-2012r2-rubyx64:
     roles:
     - agent
     platform: windows-2012r2-64
     ruby_arch: x64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: win-2012r2-x86_64
   osx-1010:
     roles:
     - agent
     platform: osx-10.10-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: osx-1010-x86_64
   redhat-7:
     roles:
     - agent
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/huaweios-6-powerpc.yaml b/acceptance/config/nodes/huaweios-6-powerpc.yaml
@@ -4,15 +4,12 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   huawei-ce6850-2-debian-vm-eth0.ops.puppetlabs.net:
     roles:
       - agent
     platform: huaweios-6-powerpc
     hypervisor: none
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/solaris-10-sparc.yaml b/acceptance/config/nodes/solaris-10-sparc.yaml
@@ -4,7 +4,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   solaris-10-sparc:
     roles:
@@ -14,7 +14,4 @@ HOSTS:
     ip: 10.32.121.124
     vmhostname: sol10-1.delivery.puppetlabs.net
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/solaris-11-sparc.yaml b/acceptance/config/nodes/solaris-11-sparc.yaml
@@ -4,7 +4,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor: vcloud
+    hypervisor: vmpooler
     template: redhat-7-x86_64
   solaris-11-sparc:
     roles:
@@ -14,7 +14,4 @@ HOSTS:
     ip: 10.32.114.245
     vmhostname: sol11-1.delivery.puppetlabs.net
 CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/