beaker-hostgenerator 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmVhOGFjMDhhMGU0ZjczZTc4ODVjOGQ0ZGQ5NDYxMDhjNWYxMmQ0OQ==
+    MDBkODc5ZGJjYmRmNjUxOTcxZWYzZWE5MjVhMDliMjFhMGI4ZWNhNg==
   data.tar.gz: !binary |-
-    ZmExZGFmZmY0MWRkYmJiZjFiY2ZlMWI2ZGVjMTI1ODE4M2MxYTBkYQ==
+    YmNhNDhlYmJiN2I0Njc1NDIxNjQ0NjBmMjIwZDhkNjg0YjEyNzIxYg==
 SHA512:
   metadata.gz: !binary |-
-    NDA0NDM4MmM5MDE2ODk2YmI4NTA1NmUyMjk5MTMyODdhMWQ0Mzc5NGZkMWMw
-    ZGI4ZjI5NTkxYmI1Nzg0YzRiYzUzYTI2Njc0NmI0NTE1YzMzMDBiZTAyMDAy
-    MTI3MmU0ZWM2MmM4NTQxYmI3NmU1YTk5YTQwOTI3OTI4ZGUxZGY=
+    NWJlODExZjQwYWMwMTlhNDIwZjc5ZmRkNjY2NDA2ZTJmZjVlNjg0M2UwOTUz
+    OWE3NTUxMjYyODk0YjIwZGY2YWE0MjAyYTE2NGYxZjhmODI4Njc5NjY0YTg5
+    MGY4MGJiMzcyOTRmODYxM2M4YWE0MzlkYjVhZTMyZWI1ZTkyYWQ=
   data.tar.gz: !binary |-
-    ODA0NTBkYmIyN2FjNmZiYWUyYmVkMzNlYmZlYTFhYzU0ZGYzOTZlZWQxNjY0
-    ODkyMGIxYTczMzkzYThmYmEzODJlMjkyYTBhYzhjMmQyMzMwYjIxOTNjZDU4
-    ZmEyZTU3MmZiMzdkN2Y1N2M3YzRhY2NhZjY4YWQyMzJmZTY0NjU=
+    Y2MyM2JhZTYzYTdkYTFjYjI4MTc0NjRmZmU3ZTVkZGVhYThkOGVhMjA2ZTQz
+    MDdiYjQzODMwODQ1MTBlNDM4YTZkMDA2NDg1NmRlYzE2MDUxNTgzOTA5MzM4
+    MTQzMTVmYzYwZTJmMGU5ZTQ4N2M4YjRjZTRiMDZmNmYzZDMyODU=

data/CHANGELOG.md

@@ -7,6 +7,14 @@ Versioning](http://semver.org).
 ## [Unreleased][unreleased]
 ### Changed
 
+## [0.7.1] - 2016-6-29
+- Add platforms:
+  - Fedora 24 x86_64 and i386
+  - Redhat 6 s390x
+  - Redhat 7 s390x
+  - SLES 11 s390x
+  - SLES 12 s390x
+
 ## [0.7.0] - 2016-6-13
 - Add optional '--global-config' CLI argument to support arbitrary values in the
   general CONFIG section of host files.

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 13 Jun, 2016 (4792554b)](#LATEST)
+* [LATEST - 29 Jun, 2016 (530baa09)](#LATEST)
+* [0.7.0 - 13 Jun, 2016 (f0aafe8d)](#0.7.0)
 * [0.6.0 - 11 May, 2016 (c807eb0d)](#0.6.0)
 * [0.5.0 - 31 Mar, 2016 (fa3ae0c8)](#0.5.0)
 * [0.4.0 - 10 Feb, 2016 (dc333b1c)](#0.4.0)
@@ -13,7 +14,76 @@
 * [0.0.1 - 7 Oct, 2015 (d99251e6)](#0.0.1)
 
 ## Details
-### <a name = "LATEST">LATEST - 13 Jun, 2016 (4792554b)
+### <a name = "LATEST">LATEST - 29 Jun, 2016 (530baa09)
+
+* (GEM) update beaker-hostgenerator version to 0.7.1 (530baa09)
+
+* Merge pull request #41 from nwolfe/maint/master/prepare-for-release (d576464b)
+
+
+```
+Merge pull request #41 from nwolfe/maint/master/prepare-for-release
+
+(MAINT) Update CHANGELOG for 0.7.1 release
+```
+* Merge pull request #42 from nwolfe/maint/master/regenerate-fixture-for-new-platforms (1e1b7f47)
+
+
+```
+Merge pull request #42 from nwolfe/maint/master/regenerate-fixture-for-new-platforms
+
+(MAINT) Regenerate test fixtures for new platforms
+```
+* (MAINT) Regenerate test fixtures for new platforms (cc4fa0ef)
+
+
+```
+(MAINT) Regenerate test fixtures for new platforms
+
+I blew away the whole fixtures/generated/ directory and regenerated them
+all again, so the new platforms will be included and tested.
+```
+* Merge pull request #39 from nwolfe/qeng3626-add-sles11-s390x (2155fb79)
+
+
+```
+Merge pull request #39 from nwolfe/qeng3626-add-sles11-s390x
+
+(QENG-3626) Add sles-11-s390x platform
+```
+* Merge pull request #38 from puppetlabs/qeng-3815 (8bcbcfef)
+
+
+```
+Merge pull request #38 from puppetlabs/qeng-3815
+
+(QENG-3815) Adding sles12-s390x
+```
+* Merge pull request #40 from puppetlabs/QENG-3960 (c0d76e1d)
+
+
+```
+Merge pull request #40 from puppetlabs/QENG-3960
+
+(QENG-3960, QENG-3817, QENG-3816) - Updated for Fedora 24 (x86_64, i3…
+```
+* (MAINT) Update CHANGELOG for 0.7.1 release (56b71af5)
+
+* (QENG-3626) Add sles-11-s390x platform (c09b8a87)
+
+* (QENG-3960, QENG-3817, QENG-3816) - Updated for Fedora 24 (x86_64, i386), el-7-s390x, and el-6-s390x (d88aba55)
+
+* (QENG-3815) Adding sles12-s390x (a95646ea)
+
+
+```
+(QENG-3815) Adding sles12-s390x
+
+Adding sles12-s390x. No vmpooler
+```
+### <a name = "0.7.0">0.7.0 - 13 Jun, 2016 (f0aafe8d)
+
+* (HISTORY) update beaker-hostgenerator history for gem release 0.7.0 (f0aafe8d)
 
 * (GEM) update beaker-hostgenerator version to 0.7.0 (4792554b)
 

data/lib/beaker-hostgenerator/cli.rb

@@ -186,6 +186,7 @@ eow
       result << "   6432  => 64-bit OS with 32-bit Puppet (Windows Only)\n"
       result << "   POWER => power OS (AIX only)\n"
       result << "   SPARC => sparc OS (Solaris only)\n"
+      result << "   S390X => s390x OS (RedHat and SLES only)\n"
       result << "\n\n"
 
       result << "built-in beaker-hostgenerator host roles:\n"

data/lib/beaker-hostgenerator/data.rb

@@ -323,6 +323,22 @@ module BeakerHostGenerator
             'template' => 'fedora-23-x86_64'
           }
         },
+        'fedora24-32' => {
+          :general => {
+            'platform' => 'fedora-24-i386'
+          },
+          :vmpooler => {
+            'template' => 'fedora-24-i386'
+          }
+        },
+        'fedora24-64' => {
+          :general => {
+            'platform' => 'fedora-24-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'fedora-24-x86_64'
+          }
+        },
         'opensuse11-32' => {
           :general => {
             'platform' => 'opensuse-11-i386'
@@ -451,6 +467,11 @@ module BeakerHostGenerator
             'template' => 'redhat-6-x86_64'
           }
         },
+        'redhat6-S390X' => {
+          :general => {
+            'platform' => 'el-6-s390x'
+          },
+        },
         'redhat7-64' => {
           :general => {
             'platform' => 'el-7-x86_64'
@@ -459,6 +480,11 @@ module BeakerHostGenerator
             'template' => 'redhat-7-x86_64'
           }
         },
+        'redhat7-S390X' => {
+          :general => {
+            'platform' => 'el-7-s390x'
+          },
+        },
         'scientific5-32' => {
           :general => {
             'platform' => 'el-5-i386'
@@ -531,6 +557,11 @@ module BeakerHostGenerator
             'template' => 'sles-11-x86_64'
           }
         },
+        'sles11-S390X' => {
+          :general => {
+            'platform' => 'sles-11-s390x'
+          },
+        },
         'sles12-64' => {
           :general => {
             'platform' => 'sles-12-x86_64'
@@ -539,6 +570,11 @@ module BeakerHostGenerator
             'template' => 'sles-12-x86_64'
           }
         },
+        'sles12-S390X' => {
+          :general => {
+            'platform' => 'sles-12-s390x'
+          }
+        },
         'solaris10-32' => {
           :general => {
             'platform' => 'solaris-10-i386'

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '0.7.0'
+    STRING = '0.7.1'
   end
 end

data/test/fixtures/generated/default/fedora24-32u

@@ -0,0 +1,21 @@
+---
+arguments_string: fedora24-32u
+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
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/default/fedora24-64l

@@ -0,0 +1,21 @@
+---
+arguments_string: fedora24-64l
+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
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

data/test/fixtures/generated/default/{opensuse11-32u → opensuse11-32c}

@@ -1,5 +1,5 @@
 ---
-arguments_string: opensuse11-32u
+arguments_string: opensuse11-32c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: opensuse-11-i386
       roles:
       - agent
-      - ca
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{opensuse11-64l → opensuse11-64d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: opensuse11-64l
+arguments_string: opensuse11-64d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: opensuse-11-x86_64
       roles:
       - agent
-      - classifier
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{oracle5-32c → oracle5-32f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: oracle5-32c
+arguments_string: oracle5-32f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: oracle-5-i386
       roles:
       - agent
-      - dashboard
+      - frictionless
   CONFIG:
     nfs_server: none
     consoleport: 443

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

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

data/test/fixtures/generated/default/{redhat6-32aulcdfm → oracle6-32aulcdfm}

@@ -1,16 +1,16 @@
 ---
-arguments_string: redhat6-32aulcdfm
+arguments_string: oracle6-32aulcdfm
 environment_variables: {}
 expected_hash:
   HOSTS:
-    redhat6-32-1:
+    oracle6-32-1:
       pe_dir: 
       pe_ver: 
       pe_upgrade_dir: 
       pe_upgrade_ver: 
       hypervisor: vmpooler
       platform: el-6-i386
-      template: redhat-6-i386
+      template: oracle-6-i386
       roles:
       - agent
       - ca

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

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

data/test/fixtures/generated/default/oracle7-64u

@@ -0,0 +1,21 @@
+---
+arguments_string: oracle7-64u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    oracle7-64-1:
+      pe_dir: 
+      pe_ver: 
+      pe_upgrade_dir: 
+      pe_upgrade_ver: 
+      hypervisor: vmpooler
+      platform: el-7-x86_64
+      template: oracle-7-x86_64
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    nfs_server: none
+    consoleport: 443
+    pooling_api: http://vmpooler.delivery.puppetlabs.net/
+expected_exception: 

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

@@ -1,5 +1,5 @@
 ---
-arguments_string: osx1010-64u
+arguments_string: osx1010-64c
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: osx-1010-x86_64
       roles:
       - agent
-      - ca
+      - dashboard
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{osx1011-64l → osx1011-64d}

@@ -1,5 +1,5 @@
 ---
-arguments_string: osx1011-64l
+arguments_string: osx1011-64d
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: osx-1011-x86_64
       roles:
       - agent
-      - classifier
+      - database
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/{osinfo-version-1/osx109-64a → default/osx109-64l}

@@ -1,5 +1,5 @@
 ---
-arguments_string: --osinfo-version 1 osx109-64a
+arguments_string: osx109-64l
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,6 +13,7 @@ expected_hash:
       template: osx-109-x86_64
       roles:
       - agent
+      - classifier
   CONFIG:
     nfs_server: none
     consoleport: 443

data/test/fixtures/generated/default/{redhat4-32c → redhat4-32f}

@@ -1,5 +1,5 @@
 ---
-arguments_string: redhat4-32c
+arguments_string: redhat4-32f
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: redhat-4-i386
       roles:
       - agent
-      - dashboard
+      - frictionless
   CONFIG:
     nfs_server: none
     consoleport: 443

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

@@ -1,5 +1,5 @@
 ---
-arguments_string: redhat4-64d
+arguments_string: redhat4-64m
 environment_variables: {}
 expected_hash:
   HOSTS:
@@ -13,7 +13,7 @@ expected_hash:
       template: redhat-4-x86_64
       roles:
       - agent
-      - database
+      - master
   CONFIG:
     nfs_server: none
     consoleport: 443