beaker 2.2.0 → 2.3.0

data/lib/beaker/hypervisor/openstack.rb

@@ -40,7 +40,7 @@ module Beaker
       if not @compute_client
         raise "Unable to create OpenStack Compute instance (api key: #{@options[:openstack_api_key]}, username: #{@options[:openstack_username]}, auth_url: #{@options[:openstack_auth_url]}, tenant: #{@options[:openstack_tenant]})"
       end
-      @network_client || Fog::Network.new(
+      @network_client ||= Fog::Network.new(
         :provider => :openstack,
         :openstack_api_key => @options[:openstack_api_key],
         :openstack_username => @options[:openstack_username],
@@ -132,6 +132,8 @@ module Beaker
                             :project           => @options[:project].to_s })
         @vms << vm
 
+        #enable root if user is not root
+        enable_root_on_hosts()
       end
     end
 
@@ -150,5 +152,28 @@ module Beaker
       end
     end
 
+    # Enables root for instances with custom username like ubuntu-amis
+    #
+    # @return [void]
+    # @api private
+    def enable_root_on_hosts
+      @hosts.each do |host|
+        enable_root(host)
+      end
+    end
+
+    # Enables root access for a host when username is not root
+    #
+    # @return [void]
+    # @api private
+    def enable_root(host)
+      if host['user'] != 'root'
+        copy_ssh_to_root(host, @options)
+        enable_root_login(host, @options)
+        host['user'] = 'root'
+        host.close
+      end
+    end
+
   end
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -31,6 +31,7 @@ module Beaker
         v_file << "    v.vm.box_url = '#{host['box_url']}'\n" unless host['box_url'].nil?
         v_file << "    v.vm.box_version = '#{host['box_version']}'\n" unless host['box_version'].nil?
         v_file << "    v.vm.box_check_update = '#{host['box_check_update'] ||= 'true'}'\n"
+        v_file << "    v.vm.synced_folder '.', '/vagrant', disabled: true\n" if host['synced_folder'] == 'disabled'
         v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\", :mac => \"#{randmac}\"\n"
 
         if /windows/i.match(host['platform'])
@@ -39,6 +40,11 @@ module Beaker
           v_file << "    v.vm.guest = :windows"
         end
 
+        if /osx/i.match(host['platform'])
+          v_file << "    v.vm.network 'private_network', ip: '10.0.1.10'\n"
+          v_file << "    v.vm.synced_folder '.', '/vagrant', :nfs => true\n"
+        end
+
         v_file << self.class.provider_vfile_section(host, options)
 
         v_file << "  end\n"
@@ -163,12 +169,12 @@ module Beaker
             @logger.info(line)
           end
           if not wait_thr.value.success?
-            raise "Failed to exec 'vagrant #{args}'"
+            raise "Failed to exec 'vagrant #{args}'. Error was #{stderr.read}"
           end
           exit_status = wait_thr.value
         }
         if exit_status != 0
-          raise "Failed to execute vagrant_cmd ( #{args} )"
+          raise "Failed to execute vagrant_cmd ( #{args} ). Error was #{stderr.read}"
         end
       end
     end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -18,6 +18,8 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
       provider_section << "      vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium','#{host['disk_path']}']\n"
       provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
       provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+      provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
+      provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
     end
     provider_section << "    end\n"
 

data/lib/beaker/options/presets.rb

@@ -119,6 +119,7 @@ module Beaker
           :log_level              => 'info',
           :trace_limit            => 10,
           :"master-start-curl-retries"  => 120,
+          :masterless             => false,
           :options_file           => nil,
           :type                   => 'pe',
           :provision              => true,

data/lib/beaker/shared/host_manager.rb

@@ -46,6 +46,27 @@ module Beaker
         a_host.first
       end
 
+      # Find at most a single host with the role provided.  Raise an error if
+      # more than one host is found to have the provided role.
+      # @param [Array<Host>] hosts The hosts to examine
+      # @param [String] role The host returned will have this role in its role list
+      # @return [Host] The single host with the desired role in its roles list
+      #                     or nil if no host is found
+      # @raise [ArgumentError] Raised if more than one host has the given role defined
+      def find_at_most_one_host_with_role(hosts, role)
+        role_hosts = hosts_with_role(hosts, role)
+        host_with_role = nil
+        case role_hosts.length
+        when 0
+        when 1
+          host_with_role = role_hosts[0]
+        else
+          host_string = ( role_hosts.map { |host| host.name } ).join( ', ')
+          raise ArgumentError, "There should be only one host with #{role} defined, but I found #{role_hosts.length} (#{host_string})"
+        end
+        host_with_role
+      end
+
       #Execute a block selecting the hosts that match with the provided criteria
       #@param [Array<Host>, Host] hosts The host or hosts to run the provided block against
       #@param [String, Symbol] filter Optional filter to apply to provided hosts - limits by name or role

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.2.0'
+    STRING = '2.3.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -50,6 +50,44 @@ module Beaker
     end
   end
 
+  describe "Masterless Setup" do
+    let( :ver ) { @ver || '3.0' }
+    let( :options )     { options = Beaker::Options::Presets.new.presets
+                          options[:masterless] = true
+                          options }
+    let( :hosts ) { make_hosts({}, 1) }
+    let( :host ) { hosts[0] }
+    let( :answers ) { Beaker::Answers.create(ver, hosts, options) }
+    let( :host_answers ) { answers.answers[host.name] }
+
+
+    it 'adds the correct answers' do
+      expect( host_answers[:q_puppetagent_server] ).to be === host_answers[:q_puppetagent_certname]
+      expect( host_answers[:q_continue_or_reenter_master_hostname]).to be === 'c'
+    end
+
+    it 'skips the correct answers' do
+      expect( host_answers[:q_puppetmaster_install]).to be === 'n'
+      expect( host_answers[:q_puppet_enterpriseconsole_install] ).to be === 'n'
+      expect( host_answers[:q_puppetdb_install] ).to be === 'n'
+    end
+
+    it '3.0: never calls #only_host_with_role in #generate_answers' do
+      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
+    end
+
+    it '3.2: never calls #only_host_with_role in #generate_answers' do
+      @ver = '3.2'
+      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
+    end
+
+    it '3.4: never calls #only_host_with_role in #generate_answers' do
+      @ver = '3.4'
+      expect( answers.generate_answers ).to_not receive( :only_host_with_role )
+    end
+
+  end
+
   describe Version34 do
     let( :options )     { Beaker::Options::Presets.new.presets }
     let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }

data/spec/beaker/dsl/helpers_spec.rb

@@ -1294,4 +1294,56 @@ describe ClassMixedWithDSLHelpers do
       end
     end
   end
+
+  describe "#write_hiera_config_on" do
+    let(:hierarchy) { [ 'nodes/%{::fqdn}', 'common' ] }
+    it 'on FOSS host' do
+      host = make_host('testhost', { :platform => 'ubuntu' } )
+      expect(subject).to receive(:create_remote_file).with(host, host[:hieraconf], /#{host[:hieradatadir]}/)
+      subject.write_hiera_config_on(host, hierarchy)
+    end
+
+    it 'on PE host' do
+      host = make_host('testhost', { :platform => 'ubuntu', :type => 'pe' } )
+      expect(subject).to receive(:create_remote_file).with(host, host[:hieraconf], /#{host[:hieradatadir]}/)
+      subject.write_hiera_config_on(host, hierarchy)
+    end
+
+  end
+
+  describe "#write_hiera_config" do
+    let(:hierarchy) { [ 'nodes/%{::fqdn}', 'common' ] }
+    it 'delegates to #write_hiera_config_on with the default host' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :write_hiera_config_on ).with( master, hierarchy).once
+      subject.write_hiera_config( hierarchy )
+    end
+
+  end
+
+  describe "#copy_hiera_data_to" do
+    let(:path) { 'spec/fixtures/hieradata' }
+    it 'on FOSS host' do
+      host = make_host('testhost', { :platform => 'ubuntu' } )
+      expect(subject).to receive(:scp_to).with(host, File.expand_path(path), host[:hieradatadir])
+      subject.copy_hiera_data_to(host, path)
+    end
+
+    it 'on PE host' do
+      host = make_host('testhost', { :platform => 'ubuntu', :type => 'pe' } )
+      expect(subject).to receive(:scp_to).with(host, File.expand_path(path), host[:hieradatadir])
+      subject.copy_hiera_data_to(host, path)
+    end
+  end
+
+  describe "#copy_hiera_data" do
+    let(:path) { 'spec/fixtures/hieradata' }
+    it 'delegates to #copy_hiera_data_to with the default host' do
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :copy_hiera_data_to ).with( master, path).once
+      subject.copy_hiera_data( path )
+    end
+
+  end
+
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -154,6 +154,13 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :hosts ).and_return( hosts )
       expect( subject.sorted_hosts ).to be === hosts
     end
+
+    it 'does not allow nil entries' do
+      allow( subject ).to receive( :options ).and_return( { :masterless => true } )
+      masterless_host = [basic_hosts[0]]
+      allow( subject ).to receive( :hosts ).and_return( masterless_host )
+      expect( subject.sorted_hosts ).to be === masterless_host
+    end
   end
 
   describe 'installer_cmd' do
@@ -372,7 +379,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :on ).with( hosts[2], /puppet config set certname/ ).once
       expect( subject ).to receive( :on ).with( hosts[3], /puppet config set certname/ ).once
       expect( subject ).to receive( :on ).with( hosts[2], /puppet agent -t/, :acceptable_exit_codes => [1] ).once
-      expect( subject ).to receive( :on ).with( hosts[3], /puppet agent -t/, :acceptable_exit_codes => [1] ).once
+      expect( subject ).to receive( :on ).with( hosts[3], /puppet agent -t/, :acceptable_exit_codes => [0, 1] ).once
       #sign certificate per-host
       expect( subject ).to receive( :sign_certificate_for ).with( hosts[0] ).once
       expect( subject ).to receive( :sign_certificate_for ).with( hosts[1] ).once
@@ -397,6 +404,30 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
       subject.do_install( hosts, opts )
     end
+
+    it 'can perform a masterless installation' do
+      hosts = make_hosts({
+        :pe_ver => '3.0',
+        :roles => ['agent']
+      }, 1)
+
+      allow( subject ).to receive( :hosts ).and_return( hosts )
+      allow( subject ).to receive( :options ).and_return({ :masterless => true })
+      allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
+      allow( subject ).to receive( :fetch_puppet ).and_return( true )
+      allow( subject ).to receive( :create_remote_file ).and_return( true )
+      allow( subject ).to receive( :stop_agent_on ).and_return( true )
+      allow( subject ).to receive( :version_is_less ).with(anything, '3.2.0').exactly(hosts.length + 1).times.and_return( false )
+
+      expect( subject ).to receive( :on ).with( hosts[0], /puppet-enterprise-installer/ ).once
+      expect( subject ).to receive( :create_remote_file ).with( hosts[0], /answers/, /q/ ).once
+      expect( subject ).to_not receive( :sign_certificate_for )
+      expect( subject ).to receive( :stop_agent_on ).with( hosts[0] ).once
+      expect( subject ).to_not receive( :sleep_until_puppetdb_started )
+      expect( subject ).to_not receive( :wait_for_host_in_dashboard )
+      expect( subject ).to_not receive( :on ).with( hosts[0], /puppet agent -t/, :acceptable_exit_codes => [0,2] )
+      subject.do_install( hosts, opts)
+    end
   end
 
   describe 'do_higgs_install' do
@@ -812,6 +843,32 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#install_packages_from_local_dev_repo' do
+    let( :package_name ) { 'puppet-agent' }
+    let( :platform ) { @platform || 'other' }
+    let( :host ) do
+      FakeHost.create('fakvm', platform, opts)
+    end
+
+    it 'sets the find command correctly for el-based systems' do
+      @platform = 'el-1-3'
+      expect( subject ).to receive( :on ).with( host, /\*\.rpm.+rpm\s-ivh/ )
+      subject.install_packages_from_local_dev_repo( host, package_name )
+    end
+
+    it 'sets the find command correctly for debian-based systems' do
+      @platform = 'debian-1-3'
+      expect( subject ).to receive( :on ).with( host, /\*\.deb.+dpkg\s-i/ )
+      subject.install_packages_from_local_dev_repo( host, package_name )
+    end
+
+    it 'fails correctly for systems not accounted for' do
+      @platform = 'eos-1-3'
+      expect{ subject.install_packages_from_local_dev_repo( host, package_name ) }.to raise_error RuntimeError
+    end
+
+  end
+
   describe '#install_puppetagent_dev_repo' do
 
     it 'raises an exception when host platform is unsupported' do

data/spec/beaker/dsl/roles_spec.rb

@@ -9,6 +9,7 @@ end
 describe ClassMixedWithDSLRoles do
 
   let( :hosts )      { @hosts || Hash.new }
+  let( :options )    { @options || Hash.new }
   let( :agent1 )     { make_host( 'agent1',     { :roles => [ 'agent' ] } ) }
   let( :agent2 )     { make_host( 'agent2',     { :roles => [ 'agent' ] } ) }
   let( :a_and_dash ) { make_host( 'a_and_dash', { :roles => [ 'agent', 'dashboard' ] } ) }
@@ -42,6 +43,12 @@ describe ClassMixedWithDSLRoles do
       expect( subject ).to receive( :hosts ).exactly( 1 ).times.and_return( hosts )
       expect { subject.master }.to raise_error Beaker::DSL::FailTest
     end
+    it 'returns nil if no master and masterless is set' do
+      @options = { :masterless => true }
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :options ).and_return( options )
+      expect( subject.master ).to be_nil
+    end
   end
   describe '#dashboard' do
     it 'returns the dashboard if there is one' do
@@ -59,6 +66,12 @@ describe ClassMixedWithDSLRoles do
       expect( subject ).to receive( :hosts ).and_return( hosts )
       expect { subject.dashboard }.to raise_error Beaker::DSL::FailTest
     end
+    it 'returns nil if no dashboard and masterless is set' do
+      @options = { :masterless => true }
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :options ).and_return( options )
+      expect( subject.dashboard ).to be_nil
+    end
   end
   describe '#database' do
     it 'returns the database if there is one' do
@@ -76,6 +89,12 @@ describe ClassMixedWithDSLRoles do
       expect( subject ).to receive( :hosts ).and_return( hosts )
       expect { subject.database }.to raise_error Beaker::DSL::FailTest
     end
+    it 'returns nil if no database and masterless is set' do
+      @options = { :masterless => true }
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :options ).and_return( options )
+      expect( subject.database ).to be_nil
+    end
   end
   describe '#default' do
     it 'returns the default host when one is specified' do
@@ -86,12 +105,18 @@ describe ClassMixedWithDSLRoles do
     it 'raises an error if there is more than one default' do
       @hosts = [ db, monolith, default, default ]
       expect( subject ).to receive( :hosts ).and_return( hosts )
-      expect { subject.database }.to raise_error Beaker::DSL::FailTest
+      expect { subject.default }.to raise_error Beaker::DSL::FailTest
     end
     it 'and raises an error if there is no default' do
       @hosts = [ agent1, agent2, custom ]
       expect( subject ).to receive( :hosts ).and_return( hosts )
-      expect { subject.database }.to raise_error Beaker::DSL::FailTest
+      expect { subject.default }.to raise_error Beaker::DSL::FailTest
+    end
+    it 'returns nil if no default and masterless is set' do
+      @options = { :masterless => true }
+      expect( subject ).to receive( :hosts ).and_return( hosts )
+      expect( subject ).to receive( :options ).and_return( options )
+      expect( subject.default ).to be_nil
     end
   end
   describe '#add_role_def' do

data/spec/beaker/host_spec.rb

@@ -56,6 +56,24 @@ module Beaker
         expect(host.is_using_passenger?).to be_truthy
         expect(host.graceful_restarts?).to be_truthy
       end
+
+      it 'can be an AIO host' do
+        options['type'] = 'aio'
+        expect(host.is_pe?).to be_falsy
+        expect(host.use_service_scripts?).to be_falsy
+        expect(host.is_using_passenger?).to be_falsy
+      end
+
+      it 'sets the paths correctly for an AIO agent host' do
+        options['type'] = 'aio'
+        expect(host['puppetvardir']).to be === Unix::Host::aio_defaults[:puppetvardir]
+      end
+
+      it 'sets the paths correctly for an AIO non-agent host' do
+        options['type'] = 'aio'
+        options['roles'] = ['master']
+        expect(host['puppetvardir']).to be === Unix::Host::foss_defaults[:puppetvardir]
+      end
     end
 
     describe "uses_passenger!" do

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -79,6 +79,17 @@ EOF
       expect( vagrantfile ).to match(/(ssh.forward_agent = true)/)
     end
 
+    it "can make a Vagrantfile with synced_folder disabled" do
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )
+
+      hosts = make_hosts({:synced_folder => 'disabled'},1)
+      vagrant.make_vfile( hosts, options )
+
+      vagrantfile = File.read( File.expand_path( File.join( path, "Vagrantfile")))
+      expect( vagrantfile ).to match(/v.vm.synced_folder .* disabled: true/)
+    end
+
     it "generates a valid windows config" do
       path = vagrant.instance_variable_get( :@vagrant_path )
       allow( vagrant ).to receive( :randmac ).and_return( "0123456789" )

data/spec/beaker/shared/host_manager_spec.rb

@@ -56,6 +56,26 @@ module Beaker
         end
       end
 
+      context "find_at_most_one_host_with_role" do
+        it "can find the single master in a set of hosts" do
+
+          expect( host_handler.find_at_most_one_host_with_role( hosts, 'master' ) ).to be === hosts[1]
+
+        end
+
+        it "throws an error when more than one host with matching role is found" do
+
+          expect{ host_handler.find_at_most_one_host_with_role( hosts, 'agent' ) }.to raise_error(ArgumentError)
+
+        end
+
+        it "returns nil when no host is found matching the role" do
+
+          expect( host_handler.find_at_most_one_host_with_role( hosts, 'surprise' ) ).to be_nil
+
+        end
+      end
+
       context "run_block_on" do
         it "can execute a block against hosts identified by a string" do
           myhosts = host_handler.run_block_on( hosts, role0 ) do |hosts|