pe_utils.rb in beaker-pe-1.8.1

- old
+ new

@@ -574,15 +574,15 @@
             host['working_dir'] = host.tmpdir(Time.new.strftime("%Y-%m-%d_%H.%M.%S"))
           end
         end
 
         # Gets the puppet-agent version, hopefully from the host or local options.
-        # Will fall back to reading the `aio_agent_build` property on the master
+        # Will fall back to reading the `aio_agent_version` property on the master
         # if neither of those two options are passed
         #
         # @note This method does have a side-effect: if it reads the
-        #   `aio_agent_build` property from master, it will store it in the local
+        #   `aio_agent_version` property from master, it will store it in the local
         #   options hash so that it won't have to do this more than once.
         #
         # @param [Beaker::Host] host Host to get puppet-agent for
         # @param [Hash{Symbol=>String}] local_options local method options hash
         #
@@ -596,12 +596,10 @@
           # the {#sorted_hosts}, so we know the master will be installed
           # before the agents
           facts_result = on(master, 'puppet facts')
           raise ArgumentError, fail_message if facts_result.exit_code != 0
           facts_hash = JSON.parse(facts_result.stdout.chomp)
-          puppet_agent_version   = facts_hash['values']['aio_agent_build']
-          # released masters don't have _build fact, fallback to _version
-          puppet_agent_version ||= facts_hash['values']['aio_agent_version']
+          puppet_agent_version = facts_hash['values']['aio_agent_version']
           raise ArgumentError, fail_message if puppet_agent_version.nil?
           logger.warn("#{log_prefix} Read puppet-agent version #{puppet_agent_version} from master")
           # saving so that we don't have to query the master more than once
           local_options[:puppet_agent_version] = puppet_agent_version
           puppet_agent_version