beaker-hostgenerator 0.7.0 → 0.7.1

data/test/fixtures/generated/{osinfo-version-1/windows2012-64u → default/windows2012-64aulcdfm}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 windows2012-64u
+arguments_string: windows2012-64aulcdfm
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -15,6 +15,11 @@ expected_hash:
       roles:
       - agent
       - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windows2012r2-6432d → windows2012r2-6432l}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windows2012r2-6432d
+arguments_string: windows2012r2-6432l
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2012r2-x86_64
       roles:
       - agent
-      - database
+      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windows2012r2-64c → windows2012r2-64u}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windows2012r2-64c
+arguments_string: windows2012r2-64u
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-2012r2-x86_64
       roles:
       - agent
-      - dashboard
+      - ca
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windows7-64f → windows7-64c}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windows7-64f
+arguments_string: windows7-64c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-7-x86_64
       roles:
       - agent
-      - frictionless
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windows8-64m → windows8-64d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windows8-64m
+arguments_string: windows8-64d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,7 +14,7 @@ expected_hash:
       template: win-8-x86_64
       roles:
       - agent
-      - master
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windows81-64aulcdfm → windows81-64f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windows81-64aulcdfm
+arguments_string: windows81-64f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,12 +14,7 @@ expected_hash:
       template: win-81-x86_64
       roles:
       - agent
-      - ca
-      - classifier
-      - dashboard
-      - database
       - frictionless
-      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{windowsvista-64a → windowsvista-64m}

@@ -1,5 +1,5 @@
 ---
-arguments_string: windowsvista-64a
+arguments_string: windowsvista-64m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,6 +14,7 @@ expected_hash:
       template: win-vista-x86_64
       roles:
       - agent
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/fedora24-32u-solaris112-32-fedora24-32m

@@ -0,0 +1,42 @@
+---
+arguments_string: fedora24-32u-solaris112-32-fedora24-32m
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora24-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: fedora-24-i386
+      template: fedora-24-i386
+      roles:
+      - agent
+      - ca
+    solaris112-32-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: solaris-11.2-i386
+      template: solaris-112-x86_64
+      roles:
+      - agent
+    fedora24-32-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: fedora-24-i386
+      template: fedora-24-i386
+      roles:
+      - agent
+      - master
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/fedora24-64l-solaris11-SPARC-fedora24-64f

@@ -0,0 +1,41 @@
+---
+arguments_string: fedora24-64l-solaris11-SPARC-fedora24-64f
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    fedora24-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: fedora-24-x86_64
+      template: fedora-24-x86_64
+      roles:
+      - agent
+      - classifier
+    solaris11-SPARC-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: solaris-11-sparc
+      roles:
+      - agent
+    fedora24-64-2:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: fedora-24-x86_64
+      template: fedora-24-x86_64
+      roles:
+      - agent
+      - frictionless
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/multiplatform/{opensuse11-32u-solaris112-32-opensuse11-32m → opensuse11-32c-solaris11-64-opensuse11-32d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: opensuse11-32u-solaris112-32-opensuse11-32m
+arguments_string: opensuse11-32c-solaris11-64-opensuse11-32d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,15 +13,15 @@ expected_hash:
       template: opensuse-11-i386
       roles:
       - agent
-      - ca
-    solaris112-32-1:
+      - dashboard
+    solaris11-64-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-11.2-i386
-      template: solaris-112-x86_64
+      platform: solaris-11-i386
+      template: solaris-11-x86_64
       roles:
       - agent
     opensuse11-32-2:
@@ -34,7 +34,7 @@ expected_hash:
       template: opensuse-11-i386
       roles:
       - agent
-      - master
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{opensuse11-64l-solaris11-SPARC-opensuse11-64f → opensuse11-64d-solaris11-32-opensuse11-64c}

@@ -1,5 +1,5 @@
 ---
-arguments_string: opensuse11-64l-solaris11-SPARC-opensuse11-64f
+arguments_string: opensuse11-64d-solaris11-32-opensuse11-64c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,14 +13,15 @@ expected_hash:
       template: opensuse-11-x86_64
       roles:
       - agent
-      - classifier
-    solaris11-SPARC-1:
+      - database
+    solaris11-32-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-11-sparc
+      platform: solaris-11-i386
+      template: solaris-11-x86_64
       roles:
       - agent
     opensuse11-64-2:
@@ -33,7 +34,7 @@ expected_hash:
       template: opensuse-11-x86_64
       roles:
       - agent
-      - frictionless
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{oracle5-32c-solaris11-64-oracle5-32d → oracle5-32f-solaris10-SPARC-oracle5-32l}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle5-32c-solaris11-64-oracle5-32d
+arguments_string: oracle5-32f-solaris10-SPARC-oracle5-32l
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,15 +13,14 @@ expected_hash:
       template: oracle-5-i386
       roles:
       - agent
-      - dashboard
-    solaris11-64-1:
+      - frictionless
+    solaris10-SPARC-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-11-i386
-      template: solaris-11-x86_64
+      platform: solaris-10-sparc
       roles:
       - agent
     oracle5-32-2:
@@ -34,7 +33,7 @@ expected_hash:
       template: oracle-5-i386
       roles:
       - agent
-      - database
+      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{oracle5-64d-solaris11-32-oracle5-64c → oracle5-64m-solaris10-64-oracle5-64u}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle5-64d-solaris11-32-oracle5-64c
+arguments_string: oracle5-64m-solaris10-64-oracle5-64u
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,15 +13,15 @@ expected_hash:
       template: oracle-5-x86_64
       roles:
       - agent
-      - database
-    solaris11-32-1:
+      - master
+    solaris10-64-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-11-i386
-      template: solaris-11-x86_64
+      platform: solaris-10-i386
+      template: solaris-10-x86_64
       roles:
       - agent
     oracle5-64-2:
@@ -34,7 +34,7 @@ expected_hash:
       template: oracle-5-x86_64
       roles:
       - agent
-      - dashboard
+      - ca
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{oracle6-32f-solaris10-SPARC-oracle6-32l → oracle6-32aulcdfm-solaris10-32-oracle6-32a}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle6-32f-solaris10-SPARC-oracle6-32l
+arguments_string: oracle6-32aulcdfm-solaris10-32-oracle6-32a
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,14 +13,20 @@ expected_hash:
       template: oracle-6-i386
       roles:
       - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
       - frictionless
-    solaris10-SPARC-1:
+      - master
+    solaris10-32-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-10-sparc
+      platform: solaris-10-i386
+      template: solaris-10-x86_64
       roles:
       - agent
     oracle6-32-2:
@@ -33,7 +39,6 @@ expected_hash:
       template: oracle-6-i386
       roles:
       - agent
-      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{oracle6-64m-solaris10-64-oracle6-64u → oracle6-64a-sles12-S390X-oracle6-64aulcdfm}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle6-64m-solaris10-64-oracle6-64u
+arguments_string: oracle6-64a-sles12-S390X-oracle6-64aulcdfm
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,15 +13,13 @@ expected_hash:
       template: oracle-6-x86_64
       roles:
       - agent
-      - master
-    solaris10-64-1:
+    sles12-S390X-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-10-i386
-      template: solaris-10-x86_64
+      platform: sles-12-s390x
       roles:
       - agent
     oracle6-64-2:
@@ -35,6 +33,11 @@ expected_hash:
       roles:
       - agent
       - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/multiplatform/{oracle7-64aulcdfm-solaris10-32-oracle7-64a → oracle7-64u-sles12-64-oracle7-64m}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle7-64aulcdfm-solaris10-32-oracle7-64a
+arguments_string: oracle7-64u-sles12-64-oracle7-64m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -14,19 +14,14 @@ expected_hash:
       roles:
       - agent
       - ca
-      - classifier
-      - dashboard
-      - database
-      - frictionless
-      - master
-    solaris10-32-1:
+    sles12-64-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
-      platform: solaris-10-i386
-      template: solaris-10-x86_64
+      platform: sles-12-x86_64
+      template: sles-12-x86_64
       roles:
       - agent
     oracle7-64-2:
@@ -39,6 +34,7 @@ expected_hash:
       template: oracle-7-x86_64
       roles:
       - agent
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443