beaker-answers 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTAxMjYyZjQ3ZTFkODFiMWU1OTAzOTRjZDVhZGEwZmRmOGRiZTVkZg==
+    NDg1YmEwYTYzYTUxOTA5NmM3YjljYzdjMzA0ZTdiZGVmYjU3Yzc1Yw==
   data.tar.gz: !binary |-
-    ZGMzOWQ0YWRmY2EzNmZhY2E5OTQ1NDdhYzZiNTJhYmU5NTFiYWMzYw==
+    YjA4Mjk5MDRlMDNmZDNiNDJlNDQwZmQ1NDY3NTA2MjE4MTk3ZTY0NA==
 SHA512:
   metadata.gz: !binary |-
-    ZGM0MmZkMjdhNDE5NjFjN2QwYmUyNzBmNDgwNWMzYjg5OWU5NWJlNDk2YzIx
-    YTczYWZjZjc5NzljMWZjOWE3YjY5NTI2MWI2ODc5ZmI3Y2VhN2E5OGIzYWY1
-    MmY1MjJiNGMxMjQyZDc4YmRkMDQ0ZjVmYmIyZDZiZWQ4ZDA3YzE=
+    NGQ2Zjc3OWYzZTNiOWUwMDRjM2Y4NGNlNGY3ZmI3MjNiODJlYWE5ZDBiZDdm
+    MmJiM2MxZmRjYmYwNTM0MTU1Nzk0YmVkYTBkMzA1YWVlNjlhNDQ4MmIwY2Yw
+    ZmI4MzQzNDgxMTY4NDMxY2Q4MzQzODgxZDk4NzEyOGE1MzZjMzY=
   data.tar.gz: !binary |-
-    M2I5MWJiODhjNzMxNzY0YjliMjdiNWNhNDllMjdjMTU4NmZlMzY2MmIwNThk
-    NjQ1MmM5ZjhlNzIzNWZjMmFmYWU3Zjk4ZWI0ZTlmNzg4OTJlMmE2ZTYyZDc2
-    NmQ5YjZiMmU3YzVlNjUyZTBhMzg5NTIzY2YyZjg1NDUxODc3ZjU=
+    ODY5MjJhZGFiZGYxZTRkMzZjMTk1OTI1ODBlNTQxN2YwZTY1NDU3NmVmZTFl
+    NjM4NmRlMTEwOGRhMDM3MzkyNTNlOWRkNGRkZjIxZmYwNmFjY2Y3YjM3NzZk
+    NDUzMjhhYWZiMmFmMDhhNjJhYmFhMTA4ZjhhZWE0NGJkNjU1ZmM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 26 May, 2016 (31f5b82c)](#LATEST)
+* [LATEST - 6 Jun, 2016 (8f6a39db)](#LATEST)
+* [0.5.1 - 26 May, 2016 (c74a3fec)](#0.5.1)
 * [0.5.0 - 26 May, 2016 (c802e883)](#0.5.0)
 * [0.4.3 - 10 May, 2016 (5ffdb5f2)](#0.4.3)
 * [0.4.2 - 28 Apr, 2016 (79ccd5de)](#0.4.2)
@@ -15,7 +16,36 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 26 May, 2016 (31f5b82c)
+### <a name = "LATEST">LATEST - 6 Jun, 2016 (8f6a39db)
+
+* (GEM) update beaker-answers version to 0.5.2 (8f6a39db)
+
+* Merge pull request #19 from ericwilliamson/task/master/PE-16028-update-for-mono (97409f9c)
+
+
+```
+Merge pull request #19 from ericwilliamson/task/master/PE-16028-update-for-mono
+
+(PE-16028) Update required answers for 2016.2
+```
+* (PE-16028) Update required answers for 2016.2 (ba130df3)
+
+
+```
+(PE-16028) Update required answers for 2016.2
+
+Previous to this commit, answer generation for 2016.2 would generate a
+list of parameters on the puppet_enterprise for both mono and split. Due
+to changes introduced in Puppet 4.4, the puppet_enterprsie module no
+longer needs all host parameters in a monolithic install case.
+This commit updates the generation to match what the module has changed
+to use. For a monolithic install, the only required answers are now the
+console admin password, and puppet_master_host. for split installs with
+PE postgres, just master, console and puppetdb host.
+```
+### <a name = "0.5.1">0.5.1 - 26 May, 2016 (c74a3fec)
+
+* (HISTORY) update beaker-answers history for gem release 0.5.1 (c74a3fec)
 
 * (GEM) update beaker-answers version to 0.5.1 (31f5b82c)
 

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.5.1'
+    STRING = '0.5.2'
   end
 end

data/lib/beaker-answers/versions/version20162.rb

@@ -76,13 +76,14 @@ module BeakerAnswers
       puppetdb = only_host_with_role(@hosts, 'database')
       console = only_host_with_role(@hosts, 'dashboard')
 
-      config["#{ns}::certificate_authority_host"] = answer_for(@options, "#{ns}::certificate_authority_host", master.hostname)
       config["#{ns}::puppet_master_host"] = answer_for(@options, "#{ns}::puppet_master_host", master.hostname)
-      config["#{ns}::console_host"] = answer_for(@options, "#{ns}::console_host", console.hostname)
-      config["#{ns}::puppetdb_host"] = answer_for(@options, "#{ns}::puppetdb_host", puppetdb.hostname)
-      config["#{ns}::database_host"] = answer_for(@options, "#{ns}::database_host", puppetdb.hostname)
-      config["#{ns}::pcp_broker_host"] = answer_for(@options, "#{ns}::pcp_broker_host", master.hostname)
-      config["#{ns}::mcollective_middleware_hosts"] = [answer_for(@options, "#{ns}::mcollective_middleware_hosts", master.hostname)]
+
+      # Monolithic installs now only require the puppet_master_host, so only pass in the console
+      # and puppetdb host if it is a split install
+      if [master, puppetdb, console].uniq.length != 1
+        config["#{ns}::console_host"] = answer_for(@options, "#{ns}::console_host", console.hostname)
+        config["#{ns}::puppetdb_host"] = answer_for(@options, "#{ns}::puppetdb_host", puppetdb.hostname)
+      end
 
       return config
     end

data/spec/beaker-answers/versions/version20162_spec.rb

@@ -1,43 +1,10 @@
 require 'spec_helper'
 require 'json'
 
-describe BeakerAnswers::Version20162 do
-  let( :ver )         { '2016.2.0' }
-  let( :options )     { StringifyHash.new }
-  let( :basic_hosts ) { make_hosts( {'pe_ver' => ver } ) }
-  let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
-                  basic_hosts[1]['roles'] = ['dashboard', 'agent']
-                  basic_hosts[2]['roles'] = ['database', 'agent']
-                  basic_hosts }
-  let( :answers )     { BeakerAnswers::Answers.create(ver, hosts, options) }
-  let( :answer_hash ) { answers.answers }
-
-  it 'adds orchestrator database answers to console' do
-    expect( answer_hash['vm2'][:q_orchestrator_database_name] ).to be === 'pe-orchestrator'
-    expect( answer_hash['vm2'][:q_orchestrator_database_user] ).to be === 'Orc3Str8R'
-  end
-
-  it 'generates valid answers if #answer_string is called' do
-    expect( answers.answer_string(basic_hosts[2]) ).to match(/q_orchestrator_database_name=pe-orchestrator/)
-  end
-
-  context 'when generating a hiera config' do
+RSpec.shared_examples 'pe.conf' do
     let( :options )      { { :format => 'hiera' } }
     let( :answer_hiera ) { answers.answer_hiera }
     let( :default_password ) { '~!@#$%^*-/ aZ' }
-    let( :gold_role_answers ) do
-      {
-        "console_admin_password" => default_password,
-        "puppet_enterprise::use_application_services" => true,
-        "puppet_enterprise::certificate_authority_host" => basic_hosts[0].hostname,
-        "puppet_enterprise::puppet_master_host" => basic_hosts[0].hostname,
-        "puppet_enterprise::console_host" => basic_hosts[1].hostname,
-        "puppet_enterprise::puppetdb_host" => basic_hosts[2].hostname,
-        "puppet_enterprise::database_host" => basic_hosts[2].hostname,
-        "puppet_enterprise::pcp_broker_host" => basic_hosts[0].hostname,
-        "puppet_enterprise::mcollective_middleware_hosts" => [basic_hosts[0].hostname],
-      }
-    end
     let( :gold_db_answers ) do
       {
         "puppet_enterprise::activity_database_user" => 'adsfglkj',
@@ -77,6 +44,14 @@ describe BeakerAnswers::Version20162 do
         "puppet_enterprise::rbac_database_password" => 'custom-rbac-password',
       }
     end
+    let( :overridding_parameters ) do
+      {
+        'puppet_enterprise::certificate_authority_host' => 'enterpriseca.vm',
+        'puppet_enterprise::console_host' => 'enterpriseconsole.vm',
+        'console_admin_password' => 'testing123',
+      }
+    end
+    let( :gold_answers_with_overrides ) { gold_role_answers.merge(overridding_parameters) }
 
     it 'should not have nil keys or values' do
       answer_hash.each_pair { |k, v|
@@ -177,20 +152,8 @@ describe BeakerAnswers::Version20162 do
         }
       end
 
-      it 'overrides the defaults when multi-level hash :answers are given' do
-        expect(answer_hash["puppet_enterprise::certificate_authority_host"]).to be === 'enterpriseca.vm'
-      end
-
-      it 'overrides the defaults when a :: delimited key is given' do
-        expect(answer_hash["puppet_enterprise::console_host"]).to be === 'enterpriseconsole.vm'
-      end
-
-      it 'overrides the console_admin_password default' do
-        expect(answer_hash["console_admin_password"]).to be === 'testing123'
-      end
-
-      it 'does not add a duplicate key to the hash' do
-        expect(answer_hash.length).to eq(gold_role_answers.length)
+      it 'matches expected answers' do
+        expect(answer_hash).to eq(gold_answers_with_overrides)
       end
     end
 
@@ -208,21 +171,60 @@ describe BeakerAnswers::Version20162 do
         }
       end
 
-      it 'overrides the defaults when multi-level hash :answers are given' do
-        expect(answer_hash["puppet_enterprise::certificate_authority_host"]).to be === 'enterpriseca.vm'
+      it 'matches expected answers' do
+        expect(answer_hash).to eq(gold_answers_with_overrides)
       end
+    end
+end
 
-      it 'overrides the defaults when a :: delimited key is given' do
-        expect(answer_hash["puppet_enterprise::console_host"]).to be === 'enterpriseconsole.vm'
-      end
+describe BeakerAnswers::Version20162 do
+  let( :ver )         { '2016.2.0' }
+  let( :options )     { StringifyHash.new }
+  let( :basic_hosts ) { make_hosts( {'pe_ver' => ver } ) }
+  let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
+                  basic_hosts[1]['roles'] = ['dashboard', 'agent']
+                  basic_hosts[2]['roles'] = ['database', 'agent']
+                  basic_hosts }
+  let( :answers )     { BeakerAnswers::Answers.create(ver, hosts, options) }
+  let( :answer_hash ) { answers.answers }
+
+  it 'adds orchestrator database answers to console' do
+    expect( answer_hash['vm2'][:q_orchestrator_database_name] ).to be === 'pe-orchestrator'
+    expect( answer_hash['vm2'][:q_orchestrator_database_user] ).to be === 'Orc3Str8R'
+  end
+
+  it 'generates valid answers if #answer_string is called' do
+    expect( answers.answer_string(basic_hosts[2]) ).to match(/q_orchestrator_database_name=pe-orchestrator/)
+  end
 
-      it 'overrides the console_admin_password default' do
-        expect(answer_hash["console_admin_password"]).to be === 'testing123'
+  context 'when generating a hiera config' do
+    context 'for a monolithic install' do
+      let( :basic_hosts ) { make_hosts( {'pe_ver' => ver }, 1 ) }
+      let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
+                      basic_hosts }
+      let( :gold_role_answers ) do
+        {
+          "console_admin_password" => default_password,
+          "puppet_enterprise::use_application_services" => true,
+          "puppet_enterprise::puppet_master_host" => basic_hosts[0].hostname,
+        }
       end
 
-      it 'does not add duplicate keys to the hash' do
-        expect(answer_hash.length).to eq(gold_role_answers.length)
+      include_examples 'pe.conf'
+    end
+
+    context 'for a split install' do
+      let( :gold_role_answers ) do
+        {
+          "console_admin_password" => default_password,
+          "puppet_enterprise::use_application_services" => true,
+          "puppet_enterprise::puppet_master_host" => basic_hosts[0].hostname,
+          "puppet_enterprise::console_host" => basic_hosts[1].hostname,
+          "puppet_enterprise::puppetdb_host" => basic_hosts[2].hostname,
+        }
       end
+
+      include_examples 'pe.conf'
     end
   end
 
@@ -362,5 +364,4 @@ describe BeakerAnswers::Version20162 do
       },
     })
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec