beaker-answers 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWZjNGQyYWFmMzE5YThhMGYxYzFiMmI0YjIyMmU4NDI4YTE3MDRiOQ==
+    MTU5ZTdlZWM5ODVlYmIyNTI5MzAxNzA3ODg1M2JmZWIyZTllMWEwZA==
   data.tar.gz: !binary |-
-    MTQzMzFmODc5OWRlNjNmMTEzZWY0YzgzZDcwN2FmZTM3NTgwMjMyNQ==
+    NjQwNGZiY2M1MTQzZjY1YzIwODEyMDQzOWRkNWRiMDE3OWNmMDEzYQ==
 SHA512:
   metadata.gz: !binary |-
-    NmUxMDFjZDYzODE3N2YxZjllNjdiMGU0YTdiMWU0Y2FkNzgyOWQxMDU2YmVj
-    NDFmOTU4MzA0NDljM2M5N2VjOTg4MDhjNTIxNjQ3YTkxNjYwYTJmZTlhOTBh
-    ZTlhNTZjNWZjODg4MWQwMjM5MjlmNDlkNWU0MGRhNzZhMTYyOWY=
+    ODBjNWI4M2U1YmU5ZmQzMmRiZjZlNWE1MDk2OTkwODU4YTFiYzY2NzIwMGJh
+    MzAxMjgzNzhhMmZhNTFkMGI2YWZiN2E4MDU1NmNiM2FmNTQ1YTZiN2QzMDVm
+    ODMzYTgwZjRlYzIwZGQ4OWFkZmRiMTQzYWFjMDNiZDY2NGJlMDc=
   data.tar.gz: !binary |-
-    ZjI1ZDQ0MTRmZTc3MTMwMWFlNjM1MGVhY2ZjNmQzYmY4YzM2ZDdlNGEwYWY5
-    ZmI5N2NjOTEzOTM3ZmJlZWY2ZjIwMDVkNmQwYWVhZWIxMGFhOGYxMDJmMjFl
-    NjA2MzU1YWMzODMzZDQ1ODA4OTg5MGU4NWZhODI0YzQ0OTBhZWU=
+    NjYyMWFmOWUzODg3OGEwNjdhZDZhY2U4MjRmYWFhY2U5YWJkZTAxYjAxMzE2
+    ZDAzYTI5YjZjNWYzYzZiOTQzYzdjYjYyYzBmNDlmOWJjNTFmYWFmODlhYmQ0
+    ZTViZmVmZWQxZTdiMzg1ZTMyZjA1YTliZmEwOTI3MzIxNGFmOWM=

data/HISTORY.md

@@ -1,8 +1,29 @@
 # default - History
 ## Tags
-* [LATEST - 26 Aug, 2015 (bcb1b2d9)](#LATEST)
+* [LATEST - 31 Aug, 2015 (9448d177)](#LATEST)
+* [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 26 Aug, 2015 (bcb1b2d9)
+### <a name = "LATEST">LATEST - 31 Aug, 2015 (9448d177)
+
+* (GEM) update beaker-answers version to 0.2.0 (9448d177)
+
+* Merge pull request #3 from nicklewis/APPMGMT-881-orchestrator-answers (40b8bed9)
+
+
+```
+Merge pull request #3 from nicklewis/APPMGMT-881-orchestrator-answers
+
+(APPMGMT-882) Add orchestrator answers for 2015.3
+```
+* (APPMGMT-882) Add orchestrator answers for 2015.3 (a0e09a31)
+
+
+```
+(APPMGMT-882) Add orchestrator answers for 2015.3
+
+This also updates Version40 answers to only support 2015.2, not 2015.3.
+```
+### <a name = "0.1.0">0.1.0 - 26 Aug, 2015 (ef47972d)
 
 * Initial release.

data/lib/beaker-answers/answers.rb

@@ -18,6 +18,9 @@ module BeakerAnswers
       :q_database_root_password                      => '=ZYdjiP3jCwV5eo9s1MBd',
       :q_database_root_user                          => 'pe-postgres',
       :q_database_export_dir                         => '/tmp',
+      :q_orchestrator_database_name                  => 'pe-orchestrator',
+      :q_orchestrator_database_user                  => 'Orc3Str8R',
+      :q_orchestrator_database_password              => '~!@#$%^*-/ aZ',
       :q_puppetdb_database_name                      => 'pe-puppetdb',
       :q_puppetdb_database_user                      => 'mYpdBu3r',
       :q_database_port                               => 5432,

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.1.0'
+    STRING = '0.2.0'
   end
 end

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

@@ -0,0 +1,32 @@
+require 'beaker-answers/versions/version40'
+
+module BeakerAnswers
+  # This class provides answer file information for PE version 2015.3
+  #
+  # @api private
+  class Version20153 < Version40
+    # The version of PE that this set of answers is appropriate for
+    def self.pe_version_matcher
+      /\A2015\.3/
+    end
+
+    def generate_answers
+      the_answers = super
+
+      return the_answers if @options[:masterless]
+
+      master = only_host_with_role(@hosts, 'master')
+      database = only_host_with_role(@hosts, 'database')
+
+      orchestrator_db = {
+        :q_orchestrator_database_name     => answer_for(@options, :q_orchestrator_database_name),
+        :q_orchestrator_database_user     => answer_for(@options, :q_orchestrator_database_user),
+        :q_orchestrator_database_password => answer_for(@options, :q_orchestrator_database_password),
+      }
+      the_answers[master.name].merge!(orchestrator_db)
+      the_answers[database.name].merge!(orchestrator_db)
+
+      the_answers
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module BeakerAnswers
 
     # The version of PE that this set of answers is appropriate for
     def self.pe_version_matcher
-      /(\A3\.99)|(\A4\.0)|(\A2015)/
+      /(\A3\.99)|(\A4\.0)|(\A2015\.[012])/
     end
 
     def generate_answers

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

@@ -29,6 +29,11 @@ describe BeakerAnswers do
     end
   end
 
+  it 'generates 2015.3 answers for 2015.3 hosts' do
+    @ver = '2015.3.0'
+    expect( answers ).to be_a_kind_of BeakerAnswers::Version20153
+  end
+
   it 'generates 4.0 answers for 2015 hosts' do
     @ver = '2015.1.2'
     expect( answers ).to be_a_kind_of BeakerAnswers::Version40
@@ -314,6 +319,34 @@ describe BeakerAnswers::Version40 do
   end
 end
 
+describe BeakerAnswers::Version20153 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 = '2015.3'
+    @answers = answers.answers
+  end
+
+  it 'should add orchestrator database answers to master' do
+    expect( @answers['vm1'][:q_orchestrator_database_name] ).to be === 'pe-orchestrator'
+    expect( @answers['vm1'][:q_orchestrator_database_user] ).to be === 'Orc3Str8R'
+    expect( @answers['vm1'][:q_orchestrator_database_password] ).to be === '~!@#$%^*-/ aZ'
+  end
+
+  it 'should add orchestrator database answers to database' do
+    expect( @answers['vm3'][:q_orchestrator_database_name] ).to be === 'pe-orchestrator'
+    expect( @answers['vm3'][:q_orchestrator_database_user] ).to be === 'Orc3Str8R'
+    expect( @answers['vm3'][:q_orchestrator_database_password] ).to be === '~!@#$%^*-/ aZ'
+  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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -187,6 +187,7 @@ files:
 - lib/beaker-answers/answers.rb
 - lib/beaker-answers/version.rb
 - lib/beaker-answers/versions/version20.rb
+- lib/beaker-answers/versions/version20153.rb
 - lib/beaker-answers/versions/version28.rb
 - lib/beaker-answers/versions/version30.rb
 - lib/beaker-answers/versions/version32.rb