version20162_spec.rb in beaker-answers-0.6.0

- old
+ new

@@ -186,19 +186,10 @@
                   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
     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 }
@@ -224,144 +215,7 @@
         }
       end
 
       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