beaker-pe 1.23.0 → 1.24.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjlmYWQxODA1M2Q3NzI3ZTM0YWNkNzk0Y2E4MDI1YWJmMzVmNTc4ZA==
+    MDkyZjU4ZGQwODQwNWY4NGZlODZiMjRjY2NmOTlhOTNjMDc0ODM2Mg==
   data.tar.gz: !binary |-
-    YWFiNmVkMTJiNDM1YTk1ODQ2MTk1ZDRlZWI3ZDJmYzM4MzQ3YjcxYg==
+    MDk4NzJiMGM3ZGYzYjdlZjlkZmFkZGM3MjY5ZjY1Y2VkOGE1MWY5MQ==
 SHA512:
   metadata.gz: !binary |-
-    MTg4NTllZTMzNjBiMTZiZTM4YmUyYzQxNDllNDM4OTU4Yjg3ZDc0NzI0ODA0
-    MTRjOTA3N2Y1ZDg2YWM1ZmU1NGRiYjY1ZDFmYjY2ZGVjZjZlYjMyMTRkNGEy
-    MmZjNzkwNzcyYjIzYmI4ZjUxNjhmNGI1NmRjMjAxNmNkZGI2MTU=
+    NjhkMmEzMjE5NTZhMDgzZWM5NDA2MDA1ZTlmYzZjMGNlMzBmMmNjNTlkZjRj
+    ODE4YTEwYmViMDkwY2ZkM2FmMmNkNDQ3NTIzMGEyZmZkNWVhZDRhOWMxMDdl
+    NDRkMDRiMmIzNjE4NDNhNGVmMWMzODIwMTU5NGU2MmI5ZDZhZDQ=
   data.tar.gz: !binary |-
-    YTJkOWVkYzc4ZjhhYWRkZmRlZWFkOTM2OTY1NmVjMjA1ZWRmYmUzODkzOWU2
-    MThkYzYxOTJkMmM2MTc0NDk1NzE0ODhhMmNiNDkyNjVmN2EzZjZjNTJkMjFh
-    ZmE0NzJiYmIwNWM4OTJkYzEwZGM0MmE1ZTE4ZTllOTc2N2Y0MTE=
+    MmRiMThhNWE3ZmJhNjExMDQ5NjEwNjhjNzAxOTg2ZWIwZTcxNGIwZTk0YjY4
+    ZWJkMGI0NTJlYzA5ZWI5NmNkYWQ0MzY1MDU3YmVmMzUxOTY3NjRkZWExMGYw
+    ODYxN2MyNWI5Y2E2ZTE4MzkzMDhlYjg5M2RiYjgyZDZjMTQwZWQ=

data/lib/beaker-pe/install/pe_utils.rb

@@ -101,6 +101,30 @@ module Beaker
           end
         end
 
+        # Return agent nodes with 'lb_connect' role that are not loadbalancers
+        def loadbalancer_connecting_agents
+          lb_connect_nodes = select_hosts(roles: ['lb_connect'])
+          lb_connect_agents = lb_connect_nodes.reject { |h| h['roles'].include?('loadbalancer')}
+        end
+
+        # Returns true if loadbalncer exists and is configured with 'lb_connect' role
+        def lb_connect_loadbalancer_exists?
+          if (any_hosts_as?('loadbalancer'))
+            lb_node = select_hosts(roles: ['loadbalancer'])
+            lb_node.first['roles'].include?('lb_connect')
+          end
+        end
+
+        #Returns loadbalancer if host is an agent and loadbalancer has lb_connect role
+        #@param [Host] agent host with lb_connect role
+        def get_lb_downloadhost(host)
+          downloadhost = master
+          if( ! host['roles'].include?('loadbalancer') &&  lb_connect_loadbalancer_exists?)
+            downloadhost = loadbalancer
+          end
+          downloadhost
+        end
+
         # Generate the command line string needed to from a frictionless puppet-agent
         # install on this host in a PE environment.
         #
@@ -124,6 +148,14 @@ module Beaker
             end
           end
 
+          # If this is an agent node configured to connect to the loadbalancer
+          # using 'lb_connect' role, then use loadbalancer in the download url
+          # instead of master (PE-22051)
+          downloadhost = master
+          if( host['roles'].include?('lb_connect'))
+            downloadhost = get_lb_downloadhost(host)
+          end
+
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
           use_puppet_ca_cert = host[:use_puppet_ca_cert] || opts[:use_puppet_ca_cert]
 
@@ -135,7 +167,7 @@ module Beaker
               cert_validator = '[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true}'
             end
 
-            cmd = %Q{powershell -c "cd #{host['working_dir']};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
+            cmd = %Q{powershell -c "cd #{host['working_dir']};#{cert_validator};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{downloadhost}:8140/packages/current/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}"}
           else
             curl_opts = %w{--tlsv1 -O}
             if use_puppet_ca_cert
@@ -144,7 +176,7 @@ module Beaker
               curl_opts << '-k'
             end
 
-            cmd = "FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd #{host['working_dir']} && curl #{curl_opts.join(' ')} https://#{master}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
+            cmd = "FRICTIONLESS_TRACE='true'; export FRICTIONLESS_TRACE; cd #{host['working_dir']} && curl #{curl_opts.join(' ')} https://#{downloadhost}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
           end
 
           return cmd
@@ -376,33 +408,41 @@ module Beaker
           else
             _console_dispatcher = get_console_dispatcher_for_beaker_pe!
 
-            # Check if we've already created a frictionless agent node group
-            # to avoid errors creating the same node group when the beaker hosts file contains
-            # multiple hosts with the same platform
-            node_group = _console_dispatcher.get_node_group_by_name('Beaker Frictionless Agent')
-            if node_group.nil? || node_group.empty?
-              node_group = {}
-              node_group['name'] = "Beaker Frictionless Agent"
-              # Pin the master to the node
-              node_group['rule'] = [ "and",  [ '=', 'name', master.to_s ]]
-              node_group['classes'] ||= {}
-            end
+            # Add pe_repo packages to 'PE Master' group
+            # This change will alow us to test the standard workflow where we add pe_repo packages
+            # to PE Master group itself. This will also make it easy to download the packages to
+            # compilemasters(PE-22051)
+            # Previosuly, we were creating a new node group 'Beaker Frictionless Agent' and adding
+            # pe_repo packages to that group
+            #
+            node_group = _console_dispatcher.get_node_group_by_name('PE Master')
 
             # add the pe_repo platform class if it's not already present
-            if ! node_group['classes'].include?(klass)
-              node_group['classes'][klass] = {}
-
-              _console_dispatcher.create_new_node_group_model(node_group)
-              # The puppet agent run that will download the agent tarballs to the master can sometimes fail with
-              # curl errors if there is a network hiccup. Use beakers `retry_on` method to retry up to
-              # three times to avoid failing the entire test pipeline due to a network blip
-              retry_opts = {
-                :desired_exit_codes => [0,2],
-                :max_retries => 3,
-                # Beakers retry_on method wants the verbose value to be a string, not a bool.
-                :verbose => 'true'
-              }
-              retry_on(master, puppet("agent -t"), retry_opts)
+            if (node_group)
+              if( ! node_group['classes'].include?(klass))
+                node_group['classes'][klass] = {}
+                _console_dispatcher.create_new_node_group_model(node_group)
+
+                # The puppet agent run that will download the agent tarballs to the master can sometimes fail with
+                # curl errors if there is a network hiccup. Use beakers `retry_on` method to retry up to
+                # three times to avoid failing the entire test pipeline due to a network blip
+                retry_opts = {
+                  :desired_exit_codes => [0,2],
+                  :max_retries => 3,
+                  # Beakers retry_on method wants the verbose value to be a string, not a bool.
+                  :verbose => 'true'
+                }
+                retry_on(master, puppet("agent -t"), retry_opts)
+
+                # Download the agent tarballs to compile masters
+                hosts.each do |h|
+                  if h['roles'].include?('compile_master')
+                    retry_on(h, puppet("agent -t"), retry_opts)
+                  end
+                end
+              end
+            else
+              raise "Failed to add pe_repo packages, PE Master node group is not available"
             end
           end
         end
@@ -598,16 +638,24 @@ module Beaker
 
             if agent_only_check_needed && hosts_agent_only.include?(host) || install_via_msi?(host)
               host['type'] = 'aio'
-              install_puppet_agent_pe_promoted_repo_on(host, {
+              install_params = {
                 :puppet_agent_version => get_puppet_agent_version(host, opts),
                 :puppet_agent_sha => host[:puppet_agent_sha] || opts[:puppet_agent_sha],
                 :pe_ver => host[:pe_ver] || opts[:pe_ver],
-                :puppet_collection => host[:puppet_collection] || opts[:puppet_collection]
-              })
+                :puppet_collection => host[:puppet_collection] || opts[:puppet_collection],
+                :pe_promoted_builds_url => host[:pe_promoted_builds_url] || opts[:pe_promoted_builds_url]
+              }
+              install_params.delete(:pe_promoted_builds_url) if install_params[:pe_promoted_builds_url].nil?
+              install_puppet_agent_pe_promoted_repo_on(host, install_params)
               # 1 since no certificate found and waitforcert disabled
               acceptable_exit_codes = [0, 1]
               acceptable_exit_codes << 2 if opts[:type] == :upgrade
-              setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
+              if masterless
+                configure_type_defaults_on(host)
+                on host, puppet_agent('-t'), :acceptable_exit_codes => acceptable_exit_codes
+              else
+                setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
+              end
             #Windows allows frictionless installs starting with PE Davis, if frictionless we need to skip this step
             elsif (host['platform'] =~ /windows/ && !(host['roles'].include?('frictionless')) || install_via_msi?(host))
               opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
@@ -1541,6 +1589,34 @@ module Beaker
             end
           end
         end
+
+        # Method to install just the agent nodes
+        # This method can be called only after installing PE on all other nodes
+        # including infrastructure nodes, loadbalancer, hubs and spokes
+        # PE-22051
+        # @param [Array] agent only nodes from Beaker hosts
+        # @param [Hash] opts The Beaker options hash
+        #
+        def install_agents_only_on(agentnodes, opts)
+          if( ! agentnodes.empty?)
+            configure_type_defaults_on(agentnodes)
+             agentnodes.each  do |host|
+               if host['platform'] != master['platform']
+                 deploy_frictionless_to_master(host)
+               end
+               install_ca_cert_on(host, opts)
+               on(host, installer_cmd(host, opts))
+             end
+             sign_certificate_for(agentnodes)
+             stop_agent_on(agentnodes, :run_in_parallel => true)
+             on agentnodes, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
+             agentnodes.select {|agent| agent['platform'] =~ /windows/}.each do |agent|
+               client_datadir = agent.puppet['client_datadir']
+               on(agent, puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
+             end
+          end
+        end
+
       end
     end
   end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.23.0'
+        STRING = '1.24.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -60,6 +60,17 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :working_dir => '/tmp',
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
 
+  let(:lei_hosts)     { make_hosts( { :pe_ver => '3.0',
+                                      :platform => 'linux',
+                                      :roles => [ 'agent' ],
+                                      :type => 'pe'}, 4 ) }
+  let(:lb_test_hosts) { lei_hosts[0][:roles] = ['master', 'database', 'dashboard']
+                        lei_hosts[1][:roles] = ['loadbalancer', 'lb_connect']
+                        lei_hosts[2][:roles] = ['compile_master']
+                        lei_hosts[3][:roles] = ['frictionless', 'lb_connect']
+                        lei_hosts[3][:working_dir] = '/tmp'
+                        lei_hosts }
+
   context '#prep_host_for_upgrade' do
 
     it 'sets per host options before global options' do
@@ -188,6 +199,22 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'loadbalancer_connecting_agents' do
+    it 'no hosts are chosen if there are no agents with lb_connect role' do
+      allow( subject ).to receive(:hosts).and_return([])
+    end
+    it 'chooses agents with lb_connect role' do
+      allow( subject ).to receive(:lb_test_hosts).and_return([lb_test_hosts[3]])
+    end
+
+  end
+
+  describe 'get_lb_downloadhost' do
+    it 'choose lb_connect loadbalancer, if there is one' do
+      allow( subject ).to receive(:lb_test_hosts[3]).and_return([lb_test_hosts[1]])
+    end
+  end
+
   describe 'frictionless_agent_installer_cmd' do
     let(:host) do
       the_host = unixhost.dup
@@ -265,6 +292,18 @@ describe ClassMixedWithDSLInstallUtils do
       "\""
       expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
     end
+
+    it 'generates a frictionless install command with loadbalancer as download host' do
+      hosts = lb_test_hosts
+      expect( subject ).to receive( :get_lb_downloadhost ).with(lb_test_hosts[3]).and_return( 'testloadbalancer' )
+      expecting = [
+        "FRICTIONLESS_TRACE='true'",
+        "export FRICTIONLESS_TRACE",
+        "cd /tmp && curl --tlsv1 -O -k https://testloadbalancer:8140/packages/current/install.bash && bash install.bash"
+      ].join("; ")
+
+      expect( subject.frictionless_agent_installer_cmd( lb_test_hosts[3], {}, '2016.4.0' ) ).to eq(expecting)
+    end
   end
 
   describe 'install_ca_cert_on' do
@@ -1079,8 +1118,14 @@ describe ClassMixedWithDSLInstallUtils do
   describe '#deploy_frictionless_to_master' do
     let(:master) { make_host('master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
     let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
+    let(:compile_master) { make_host('agent', :pe_ver => '2017.2', :roles => ['frictionless', 'compile_master']) }
     let(:dispatcher) { double('dispatcher') }
-    let(:node_group) { {} }
+    let(:node_group) do
+      {
+          'classes' => {
+          },
+      }
+    end
 
     before :each do
       allow(subject).to receive(:retry_on)
@@ -1090,12 +1135,12 @@ describe ClassMixedWithDSLInstallUtils do
 
       allow(dispatcher).to receive(:get_node_group_by_name).and_return(node_group)
       allow(dispatcher).to receive(:create_new_node_group_model) {|model| node_group.update(model)}
+      allow(subject).to receive(:compile_masters).and_return([compile_master])
     end
 
-    it 'adds the right pe_repo class to the Beaker Frictionless Agent group' do
+    it 'adds the right pe_repo class to the PE Master group' do
       subject.deploy_frictionless_to_master(agent)
 
-      expect(node_group['rule']).to eq(['and', ['=', 'name', 'master']])
       expect(node_group['classes']).to include('pe_repo::platform::el_7_x86_64')
     end
 
@@ -1216,10 +1261,12 @@ describe ClassMixedWithDSLInstallUtils do
       hosts = make_hosts({
         :pe_ver => '4.0',
         :roles => ['agent'],
-      }, 3)
+      }, 4)
       hosts[0][:roles] = ['master', 'database', 'dashboard']
       hosts[1][:platform] = 'windows'
       hosts[2][:platform] = Beaker::Platform.new('el-6-x86_64')
+      hosts[2][:pe_promoted_builds_url] = nil
+      hosts[3][:pe_promoted_builds_url] = 'test-url'
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
       allow( subject ).to receive( :options ).and_return(Beaker::Options::Presets.new.presets)
@@ -1248,19 +1295,29 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with(
         hosts[1],
         {
-          :puppet_agent_version => pa_version,
-          :puppet_agent_sha => nil,
-          :pe_ver => hosts[1][:pe_ver],
-          :puppet_collection => nil
+          :puppet_agent_version   => pa_version,
+          :puppet_agent_sha       => nil,
+          :pe_ver                 => hosts[1][:pe_ver],
+          :puppet_collection      => nil,
         }
       ).once
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with(
         hosts[2],
         {
-          :puppet_agent_version => pa_version,
-          :puppet_agent_sha => nil,
-          :pe_ver => hosts[2][:pe_ver],
-          :puppet_collection => nil
+          :puppet_agent_version   => pa_version,
+          :puppet_agent_sha       => nil,
+          :pe_ver                 => hosts[2][:pe_ver],
+          :puppet_collection      => nil,
+        }
+      ).once
+      expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with(
+        hosts[3],
+        {
+          :puppet_agent_version   => pa_version,
+          :puppet_agent_sha       => nil,
+          :pe_ver                 => hosts[3][:pe_ver],
+          :puppet_collection      => nil,
+          :pe_promoted_builds_url => 'test-url'
         }
       ).once
       hosts.each do |host|
@@ -1325,7 +1382,7 @@ describe ClassMixedWithDSLInstallUtils do
           :puppet_agent_version => pa_version,
           :puppet_agent_sha => nil,
           :pe_ver => hosts[1][:pe_ver],
-          :puppet_collection => nil
+          :puppet_collection => nil,
         }
       ).once
       expect( subject ).to receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
@@ -1392,10 +1449,10 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive(
         :install_puppet_agent_pe_promoted_repo_on
       ).with( hosts[1], {
-        :puppet_agent_version => pa_version,
-        :puppet_agent_sha     => nil,
-        :pe_ver               => hosts[1][:pe_ver],
-        :puppet_collection    => nil
+        :puppet_agent_version   => pa_version,
+        :puppet_agent_sha       => nil,
+        :pe_ver                 => hosts[1][:pe_ver],
+        :puppet_collection      => nil,
       } )
       # expect( subject ).to receive( :on ).with( hosts[2], /puppet-enterprise-installer/ ).once
       hosts.each do |host|
@@ -1446,6 +1503,22 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:sign_certificate_for)
     end
 
+  describe 'install_agents_only_on' do
+    let(:lb_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'debian-7-x86_64', :roles => ['frictionless', 'lb_connect']) }
+
+    before :each do
+      allow(subject).to receive(:on)
+      allow(subject).to receive(:configure_type_defaults_on)
+      allow(subject).to receive(:deploy_frictionless_to_master)
+      allow(subject).to receive(:install_agents_only_on)
+
+      allow(subject).to receive(:installer_cmd).with(lb_agent, anything()).and_return("install lb agent")
+
+      allow(subject).to receive(:stop_agent_on)
+      allow(subject).to receive(:sign_certificate_for)
+    end
+  end
+
     describe 'configuring frictionless installer' do
       it "skips the master's platform" do
         expect(subject).not_to receive(:deploy_frictionless_to_master)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.24.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!