beaker-answers 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzMxMWVjMjk1ZjE0YTUzNjk5OGM3NTRlNTg5MjE5NjRmYjZjMmE5MA==
+    MjA5Nzc1NDk5NTY3Nzk2YTg3MWY5ZmM3MmEwZTE2NzI5MGU0Nzc1OQ==
   data.tar.gz: !binary |-
-    ZTRhOWUyN2E5NWVmMzU5ZWQyZGY5YTNhZTgzNjA3Zjg1OTY1OThjMw==
+    MDM1MTA5MmU3YWJjODQ2ODliNWIyNjk4MTBkMmJjYzBjNTRhYzdhMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTlhZmM0NTVkODk1NzEyNDgwODczNzJkOGFmZjRmZmU5ZGFlMDAwNzQ5ODg4
-    NGUwYjUzMjk3YmJkMmZmNTgwNzhiNDdjMWJiMzNiZjU2NGQ1ZGRhYjZlMDI5
-    MjQ3YjdkM2I0NTljZThlZDc3ZmVmY2E3MTBkYjhmYzljNTlkODA=
+    MTkyNzFlNjdlNTE0YTJlMjc5ZjNkNjdlNjQyZmQ0YmZlZWJmODAxNWIzMWQ3
+    ODliZGI1NDgzMjBiMWI4MTUxNjU4OTc4M2Y5OTdjZTBmYjA2NmE5NjE5MTVh
+    Yzc0OWE3MzkzMjMzYjRjY2NiNzkyZGQzMGQ4YWZhY2U0ZmIzMzg=
   data.tar.gz: !binary |-
-    NTI5NDJjMzUwMzE2YjM0YTE0NDE4NWI5Y2Q3Y2IxOTQ3NDIzZDVmMzg0ZDJh
-    ZGY5ZTRjY2M0MjNkZDY4ZjMwM2MzODJkZjFmNzllMWFkMjIyZTk3NzU4NmQx
-    NTc2YzA1N2FjMTcwNzA1ZTJmZDk2MjBlZmY3ZTgxNGMyMGYwY2Y=
+    YTZjNWYxMjIxYjM1NmJhMGQ0M2VhNTM3ZWZlNmJhZDlhYmE2MDQ5NDg5Y2Vh
+    ODRmMDAzODY4YjVmZWUwYzAzNGRlMDM4MWMwYWM2ZDNjNmExYTFiYjQyNGNj
+    YmE0ZmU5ZmY0M2RlMTllZjE2NzhkZWQ2ZGY1OGZjOTdjZmJlMmE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 28 Apr, 2016 (331f9d3e)](#LATEST)
+* [LATEST - 10 May, 2016 (92edeb28)](#LATEST)
+* [0.4.2 - 28 Apr, 2016 (79ccd5de)](#0.4.2)
 * [0.4.1 - 28 Apr, 2016 (d9d14510)](#0.4.1)
 * [0.4.0 - 12 Feb, 2016 (96d0d7cf)](#0.4.0)
 * [0.3.2 - 10 Nov, 2015 (f699c033)](#0.3.2)
@@ -12,7 +13,31 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 28 Apr, 2016 (331f9d3e)
+### <a name = "LATEST">LATEST - 10 May, 2016 (92edeb28)
+
+* (GEM) update beaker-answers version to 0.4.3 (92edeb28)
+
+* Merge pull request #14 from ericwilliamson/task/master/legacy-ssl-auth-support (bef1af14)
+
+
+```
+Merge pull request #14 from ericwilliamson/task/master/legacy-ssl-auth-support
+
+(PE-14877) Pass in orchestrator db to console
+```
+* (PE-14877) Pass in orchestrator db to console (f1d09078)
+
+
+```
+(PE-14877) Pass in orchestrator db to console
+
+To allow SSL cert based auth in the new installer while maintaining the legacy
+bash script, the console node now needs to know about the orchestrator database user
+and name if they are specified to be non default
+```
+### <a name = "0.4.2">0.4.2 - 28 Apr, 2016 (79ccd5de)
+
+* (HISTORY) update beaker-answers history for gem release 0.4.2 (79ccd5de)
 
 * (GEM) update beaker-answers version to 0.4.2 (331f9d3e)
 

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.4.2'
+    STRING = '0.4.3'
   end
 end

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

@@ -9,5 +9,24 @@ module BeakerAnswers
     def self.pe_version_matcher
       /\A2016\.2/
     end
+
+    def generate_answers
+      the_answers = super
+
+      return the_answers if @options[:masterless]
+      console = only_host_with_role(@hosts, 'dashboard')
+
+      # To allow SSL cert based auth in the new installer while maintaining the legacy
+      # bash script, the console node now needs to know about the orchestrator database user
+      # and name if they are specified to be non default
+      orchestrator_db = {
+        :q_orchestrator_database_name     => answer_for(@options, :q_orchestrator_database_name),
+        :q_orchestrator_database_user     => answer_for(@options, :q_orchestrator_database_user),
+      }
+
+      the_answers[console.name].merge!(orchestrator_db)
+
+      the_answers
+    end
   end
 end

data/spec/beaker-answers/beaker-answers_spec.rb

@@ -357,6 +357,27 @@ describe BeakerAnswers::Version20153 do
   end
 end
 
+describe BeakerAnswers::Version20162 do
+  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( :upgrade_answers )     { BeakerAnswers::Answers.create(@ver, hosts, options.merge( {:type => :upgrade}) ) }
+
+  before :each do
+    @ver = '2016.2'
+    @answers = answers.answers
+  end
+
+  it 'should add orchestrator database answers to console' do
+    expect( @answers['vm2'][:q_orchestrator_database_name] ).to be === 'pe-orchestrator'
+    expect( @answers['vm2'][:q_orchestrator_database_user] ).to be === 'Orc3Str8R'
+  end
+end
+
 describe BeakerAnswers::Version32 do
   let( :options )     { StringifyHash.new }
   let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec