version20171_spec.rb in beaker-answers-0.14.0

- old
+ new
@@ -1,51 +1,30 @@
 require 'spec_helper'
 require 'json'
 
 describe BeakerAnswers::Version20171 do
-  let( :ver )         { '2017.1.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 }
+  let(:ver)         { '2017.1.0' }
+  let(:options)     { StringifyHash.new }
+  let(:mono_hosts) do
+    basic_hosts = make_hosts({'pe_ver' => ver }, 1)
+    basic_hosts[0]['roles'] = ['master', 'agent', 'dashboard', 'database']
+    basic_hosts[0]['platform'] = 'el-7-x86_64'
+    basic_hosts
+  end
+  let(:answers)     { BeakerAnswers::Answers.create(ver, hosts, options) }
+  let(:answer_hash) { answers.answers }
 
-  context 'when generating a hiera config' do
+  context 'when generating a default 1.0 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
+      let(:hosts) { mono_hosts }
+      let(:gold_role_answers) do
         {
           "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::monolithic::primary_master" => [basic_hosts[0].hostname],
-          }
+          "puppet_enterprise::puppet_master_host" => hosts[0].hostname,
         }
       end
 
-      it "accepts overrides to node_roles from beaker conf answers"
-
       include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
-    end
-
-    context 'for a split install' do
-      let( :gold_role_answers ) do
-        {
-          "console_admin_password" => default_password,
-          "node_roles" => {
-            "pe_role::split::primary_master" => [basic_hosts[0].hostname],
-            "pe_role::split::console" => [basic_hosts[1].hostname],
-            "pe_role::split::puppetdb" => [basic_hosts[2].hostname],
-          }
-        }
-      end
-
-      include_examples 'pe.conf'
-      include_examples 'valid MEEP 2.0 pe.conf'
+      include_examples 'valid MEEP 1.0 pe.conf'
     end
   end
 end