beaker-answers 0.5.2 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDg1YmEwYTYzYTUxOTA5NmM3YjljYzdjMzA0ZTdiZGVmYjU3Yzc1Yw==
+    Yjk4YTE4NGMzZjRjMDAzYWRiNWY5ZThjOTIzN2MwYjRhYmQ1YmZlMw==
   data.tar.gz: !binary |-
-    YjA4Mjk5MDRlMDNmZDNiNDJlNDQwZmQ1NDY3NTA2MjE4MTk3ZTY0NA==
+    NWRkOWU0ZTAzMDg2MGRlM2FhNTM1ODE5NDg5MDRjMGRkOTczOTVhOQ==
 SHA512:
   metadata.gz: !binary |-
-    NGQ2Zjc3OWYzZTNiOWUwMDRjM2Y4NGNlNGY3ZmI3MjNiODJlYWE5ZDBiZDdm
-    MmJiM2MxZmRjYmYwNTM0MTU1Nzk0YmVkYTBkMzA1YWVlNjlhNDQ4MmIwY2Yw
-    ZmI4MzQzNDgxMTY4NDMxY2Q4MzQzODgxZDk4NzEyOGE1MzZjMzY=
+    OWNlZmI5Nzg4YWI1OTMzM2EzZmY2NjE3OGY4MTNmZWY3OWM0MzVjNWRkNjNl
+    MWZiOTc5OGMyNGQ5MzIyNWExYjMyZjNjM2Y5YWEwNDhjMDNkOGEwNTlkZTlk
+    NjAyZDUwZjY5NmQxNWJiNmY1ODUwYzg2NDZmMGFhMjFkZDliZWU=
   data.tar.gz: !binary |-
-    ODY5MjJhZGFiZGYxZTRkMzZjMTk1OTI1ODBlNTQxN2YwZTY1NDU3NmVmZTFl
-    NjM4NmRlMTEwOGRhMDM3MzkyNTNlOWRkNGRkZjIxZmYwNmFjY2Y3YjM3NzZk
-    NDUzMjhhYWZiMmFmMDhhNjJhYmFhMTA4ZjhhZWE0NGJkNjU1ZmM=
+    OTkxODA4NmYxMmQyNzgzNjNmNDRiMTNjOGZjOTBkOGIxNjI2NTMzZThmZmU2
+    OWE4YWRhY2ZhOTkyNzc1NDU1YWViZmQ1NzAxYTdmYWI1ZTlkYzYyM2VlN2Ey
+    MTQwZGNjMGVlYTk0ZmVhZGRkNTc2YTU4YzE5ZTMwMzFhZGVmNjY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 6 Jun, 2016 (8f6a39db)](#LATEST)
+* [LATEST - 15 Jun, 2016 (7ffb00c1)](#LATEST)
+* [0.5.2 - 6 Jun, 2016 (bb16b018)](#0.5.2)
 * [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)
@@ -16,7 +17,33 @@
 * [0.1.0 - 26 Aug, 2015 (ef47972d)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 6 Jun, 2016 (8f6a39db)
+### <a name = "LATEST">LATEST - 15 Jun, 2016 (7ffb00c1)
+
+* (GEM) update beaker-answers version to 0.6.0 (7ffb00c1)
+
+* Merge pull request #21 from demophoon/task/master/pe-14555-meep-cutover (45c36f80)
+
+
+```
+Merge pull request #21 from demophoon/task/master/pe-14555-meep-cutover
+
+(PE-14555) Remove bash answers for 2016.2.0
+```
+* (PE-14555) Remove bash answers for 2016.2.0 (7d0c9b35)
+
+
+```
+(PE-14555) Remove bash answers for 2016.2.0
+
+Prior to this commit we allowed generating either hiera or bash answers
+for 2016.2.0.
+
+This commit removes the bash answers, because future builds of 2016.2.0
+will not accept them.
+```
+### <a name = "0.5.2">0.5.2 - 6 Jun, 2016 (bb16b018)
+
+* (HISTORY) update beaker-answers history for gem release 0.5.2 (bb16b018)
 
 * (GEM) update beaker-answers version to 0.5.2 (8f6a39db)
 

data/lib/beaker-answers/version.rb

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

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

@@ -15,14 +15,7 @@ module BeakerAnswers
 
       return the_answers if @options[:masterless]
 
-      case @format
-      when :bash
-        return generate_bash_answers(the_answers)
-      when :hiera
-        return generate_hiera_config
-      else
-        raise NotImplementedError, "Don't know how to generate answers for #{@format}"
-      end
+      return generate_hiera_config
     end
 
     def generate_bash_answers(answers)
@@ -126,12 +119,7 @@ module BeakerAnswers
     end
 
     def installer_configuration_string(host)
-      case @format
-        when :bash then answer_string(host)
-        when :hiera then answer_hiera
-        else
-          raise NotImplementedError, "Don't know how to generate for configuration #{@format}"
-      end
+      answer_hiera
     end
   end
 end

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

@@ -188,15 +188,6 @@ describe BeakerAnswers::Version20162 do
   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
     context 'for a monolithic install' do
       let( :basic_hosts ) { make_hosts( {'pe_ver' => ver }, 1 ) }
@@ -227,141 +218,4 @@ describe BeakerAnswers::Version20162 do
       include_examples 'pe.conf'
     end
   end
-
-  # This spec is just providing a baseline for :bash answer generation/regression.
-  # This and bash answer generation in 2016.2.0+ should be dropped once we've cutover.
-  it 'continues to provide same set of :bash answers' do
-    expect(answer_hash).to eq({
-      "vm1" => {
-        :q_install=>"y",
-        :q_vendor_packages_install=>"y",
-        :q_puppetagent_install=>"y",
-        :q_verify_packages=>"y",
-        :q_puppet_symlinks_install=>"y",
-        :q_puppetagent_certname=>"vm1",
-        :q_puppetmaster_install=>"y",
-        :q_all_in_one_install=>"n",
-        :q_puppet_enterpriseconsole_install=>"n",
-        :q_puppetdb_install=>"n",
-        :q_database_install=>"n",
-        :q_puppetagent_server=>"vm1",
-        :q_puppetdb_hostname=>"vm3",
-        :q_puppetdb_port=>8081,
-        :q_puppetmaster_dnsaltnames=>"vm1,ip.address.for.vm1,puppet",
-        :q_puppetmaster_enterpriseconsole_hostname=>"vm2",
-        :q_puppetmaster_enterpriseconsole_port=>443,
-        :q_puppetmaster_certname=>"vm1",
-        :q_pe_check_for_updates=>"n",
-        :q_exit_for_nc_migrate=>"n",
-        :q_enable_future_parser=>"n",
-        :q_update_server_host=>"vm1",
-        :q_install_update_server=>"y",
-        :q_orchestrator_database_name=>"pe-orchestrator",
-        :q_orchestrator_database_user=>"Orc3Str8R",
-        :q_orchestrator_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_database_host=>"vm3",
-        :q_database_port=>5432,
-        :q_use_application_services=>"y"
-      },
-      "vm2" => {
-        :q_install=>"y",
-        :q_vendor_packages_install=>"y",
-        :q_puppetagent_install=>"y",
-        :q_verify_packages=>"y",
-        :q_puppet_symlinks_install=>"y",
-        :q_puppetagent_certname=>"vm2",
-        :q_puppetmaster_install=>"n",
-        :q_all_in_one_install=>"n",
-        :q_puppet_enterpriseconsole_install=>"y",
-        :q_puppetdb_install=>"n",
-        :q_database_install=>"n",
-        :q_puppetagent_server=>"vm1",
-        :q_puppetdb_hostname=>"vm3",
-        :q_puppetdb_port=>8081,
-        :q_puppetdb_database_name=>"pe-puppetdb",
-        :q_puppetdb_database_user=>"mYpdBu3r",
-        :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_puppet_enterpriseconsole_auth_database_name=>"console_auth",
-        :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r",
-        :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_puppet_enterpriseconsole_database_name=>"console",
-        :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r",
-        :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_database_host=>"vm3",
-        :q_database_port=>5432,
-        :q_pe_database=>"y",
-        :q_puppet_enterpriseconsole_inventory_hostname=>"vm2",
-        :q_puppet_enterpriseconsole_inventory_certname=>"vm2",
-        :q_puppet_enterpriseconsole_inventory_dnsaltnames=>"vm2",
-        :q_puppet_enterpriseconsole_inventory_port=>8140,
-        :q_puppet_enterpriseconsole_master_hostname=>"vm1",
-        :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'",
-        :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'",
-        :q_puppet_enterpriseconsole_httpd_port=>443,
-        :q_puppet_enterpriseconsole_smtp_host=>"'vm2'",
-        :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'",
-        :q_puppet_enterpriseconsole_smtp_port=>"'25'",
-        :q_puppetmaster_certname=>"vm1",
-        :q_pe_check_for_updates=>"n",
-        :q_classifier_database_user=>"DFGhjlkj",
-        :q_classifier_database_name=>"pe-classifier",
-        :q_classifier_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_activity_database_user=>"adsfglkj",
-        :q_activity_database_name=>"pe-activity",
-        :q_activity_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_rbac_database_user=>"RbhNBklm",
-        :q_rbac_database_name=>"pe-rbac",
-        :q_rbac_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_exit_for_nc_migrate=>"n",
-        :q_enable_future_parser=>"n",
-        :q_update_server_host=>"vm1",
-        :q_use_application_services=>"y",
-        :q_orchestrator_database_name=>"pe-orchestrator",
-        :q_orchestrator_database_user=>"Orc3Str8R"
-      },
-      "vm3" => {
-        :q_install=>"y",
-        :q_vendor_packages_install=>"y",
-        :q_puppetagent_install=>"y",
-        :q_verify_packages=>"y",
-        :q_puppet_symlinks_install=>"y",
-        :q_puppetagent_certname=>"vm3",
-        :q_puppetmaster_install=>"n",
-        :q_all_in_one_install=>"n",
-        :q_puppet_enterpriseconsole_install=>"n",
-        :q_puppetdb_install=>"y",
-        :q_database_install=>"y",
-        :q_puppetagent_server=>"vm1",
-        :q_puppetmaster_certname=>"vm1",
-        :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'",
-        :q_database_root_user=>"pe-postgres",
-        :q_puppetdb_database_name=>"pe-puppetdb",
-        :q_puppetdb_database_user=>"mYpdBu3r",
-        :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_puppet_enterpriseconsole_auth_database_name=>"console_auth",
-        :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r",
-        :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_puppet_enterpriseconsole_database_name=>"console",
-        :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r",
-        :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_database_host=>"vm3",
-        :q_database_port=>5432,
-        :q_classifier_database_user=>"DFGhjlkj",
-        :q_classifier_database_name=>"pe-classifier",
-        :q_classifier_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_activity_database_user=>"adsfglkj",
-        :q_activity_database_name=>"pe-activity",
-        :q_activity_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_rbac_database_user=>"RbhNBklm",
-        :q_rbac_database_name=>"pe-rbac",
-        :q_rbac_database_password=>"'~!@\#$%^*-/ aZ'",
-        :q_exit_for_nc_migrate=>"n",
-        :q_enable_future_parser=>"n",
-        :q_update_server_host=>"vm1",
-        :q_orchestrator_database_name=>"pe-orchestrator",
-        :q_orchestrator_database_user=>"Orc3Str8R",
-        :q_orchestrator_database_password=>"'~!@\#$%^*-/ aZ'"
-      },
-    })
-  end
 end

metadata

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