foreman_rh_cloud 7.0.45 → 7.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ccb21d6d17487bea0ab663a295419706f007207d62c41fc7e0fce30071fdbd0
-  data.tar.gz: 7f45fd6cb0dfaca6ecd7d0a8a59488aebc91ef9a773056774c062da4623443d7
+  metadata.gz: c5493c69d3f1918da42b12dfc523e6bf387203e1d1cdd057d6bea1e401caeef6
+  data.tar.gz: 7413d1788622b27285da6a7257928b57b79bb6de8660ca9f966edcbb4cc7ee00
 SHA512:
-  metadata.gz: 9f4a974b345a78cfb4071f6648effb5715e7dcd44fe8e0a0dd2a634a03db788a8b7f819bd785974ad378c3b1a8cb01ee1c58a428753335d732da7b2e3192c9a6
-  data.tar.gz: e3319409f79b9de5eb04fe8bfd07b0efa99d4065bf2a41ef78cfb7db8d210bdbdb0a030c1b3feb406d9ba41627343c5afe2a8f301f22467bfb7eb15fba3c454d
+  metadata.gz: bf2220d31d2bc0b41291560ea0f25a8a88c33d73e281915ebe4534bf0a2fbd80be8f815776b38eade95366e92824179519decf91062f607a60c396e03a0387e2
+  data.tar.gz: 9d16b6f204bc3585e00b012e0fa47132ae4209fbaa85015c8db99ebce79aac167fa85374423366b2ff4ecd2cb725a20d7a5d52b61873f525b37ea7094e23fc7f

data/db/migrate/20221102110254_fix_rh_cloud_settings_category_to_dsl.rb

@@ -2,6 +2,6 @@
 
 class FixRhCloudSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::RhCloud').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -109,6 +109,18 @@ module ForemanInventoryUpload
         IPAddr.new(max_obfuscated + 1, Socket::AF_INET).to_s
       end
 
+      def hostname_match
+        bash_hostname = `uname -n`.chomp
+        foreman_hostname = ForemanRhCloud.foreman_host&.name
+        if bash_hostname == foreman_hostname
+          fqdn(foreman_hostname)
+        elsif Setting[:obfuscate_inventory_hostnames]
+          obfuscate_fqdn(bash_hostname)
+        else
+          bash_hostname
+        end
+      end
+
       def bios_uuid(host)
         value = fact_value(host, 'dmi::system::uuid') || ''
         uuid_value(value)

data/lib/foreman_inventory_upload/generators/metadata.rb

@@ -1,6 +1,7 @@
 module ForemanInventoryUpload
   module Generators
     class Metadata
+      include FactHelpers
       def initialize(output = [])
         @stream = JsonStream.new(output)
       end
@@ -28,6 +29,9 @@ module ForemanInventoryUpload
           @stream.simple_field('report_id', Foreman.uuid)
           @stream.simple_field('host_inventory_api_version', '1.0')
           @stream.simple_field('source', 'Satellite')
+          @stream.simple_field('reporting_host_name', hostname_match)
+          @stream.simple_field('reporting_host_ips', host_ips(ForemanRhCloud.foreman_host))
+          @stream.simple_field('reporting_host_bios_uuid', bios_uuid(ForemanRhCloud.foreman_host))
           @stream.simple_field('source_metadata', metadata)
           @stream.object_field('report_slices', :last) do
             yield(self)

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '7.0.45'.freeze
+  VERSION = '7.0.47'.freeze
 end

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -43,7 +43,17 @@ module InsightsCloud
       end
 
       def done?(current_status = invocation_status)
-        job_invocation.finished? || current_status.map { |_host_id, task_status| task_status['report_done'] }.all?
+        ActiveModel::Type::Boolean.new.cast(current_status[:task_state][:task_done_reported])
+      end
+
+      def job_finished?
+        job_invocation.finished?
+      end
+
+      def all_hosts_finished?(current_status)
+        current_status[:hosts_state].values.all? do |status|
+          ActiveModel::Type::Boolean.new.cast(status['report_done'] == true)
+        end
       end
 
       # noop, we don't want to do anything when the polling task starts
@@ -95,7 +105,11 @@ module InsightsCloud
       end
 
       def host_status(host)
-        external_task&.dig('invocation_status', host)
+        external_task&.dig('invocation_status', :hosts_state, host)
+      end
+
+      def task_done_state
+        ActiveModel::Type::Boolean.new.cast(external_task&.dig('invocation_status', :task_state, :task_done_reported))
       end
 
       def sequence(host)
@@ -111,13 +125,15 @@ module InsightsCloud
       end
 
       def invocation_status
-        Hash[job_invocation.targeting.hosts.map do |host|
+        hosts_state = Hash[job_invocation.targeting.hosts.map do |host|
           next unless host.insights&.uuid
           [
             host.insights.uuid,
             task_status(job_invocation.sub_task_for_host(host), host.insights.uuid),
           ]
         end.compact]
+
+        {task_state: {task_done_reported: task_done_state}, hosts_state: hosts_state}
       end
 
       def task_status(host_task, host_name)
@@ -128,7 +144,7 @@ module InsightsCloud
         {
           'state' => host_task.state,
           'output' => host_task.main_action.live_output.map { |line| line['output'] }.join("\n"),
-          'exit_status' => host_task.main_action.exit_status,
+          'exit_status' => ActiveModel::Type::Integer.new.cast(host_task.main_action.exit_status),
           'sequence' => sequence(host_name),
           'report_done' => host_done?(host_name),
         }
@@ -138,9 +154,9 @@ module InsightsCloud
         generator = InsightsCloud::Generators::PlaybookProgressGenerator.new(correlation_id)
         all_hosts_success = true
 
-        invocation_status.each do |host_name, status|
+        invocation_status[:hosts_state].each do |host_name, status|
           # skip host if the host already reported that it's finished
-          next if status['report_done']
+          next if ActiveModel::Type::Boolean.new.cast(status['report_done'])
 
           unless status['state'] == 'unknown'
             sequence = status['sequence']
@@ -154,7 +170,11 @@ module InsightsCloud
             all_hosts_success &&= status['exit_status'] == 0
           end
         end
-        generator.job_finished_message(all_hosts_success) if done?(invocation_status)
+
+        if (job_finished? || all_hosts_finished?(invocation_status))
+          generator.job_finished_message(all_hosts_success)
+          invocation_status[:task_state][:task_done_reported] = true
+        end
 
         send_report(generator.generate)
       end

data/lib/tasks/hybrid_cloud.rake

@@ -0,0 +1,63 @@
+require 'io/console'
+
+namespace :rh_cloud do |args|
+  desc 'Register Satellite Organization with Hybrid Cloud API. \
+        Specify org_id=x replace your organization ID with x. \
+        Specify SATELLITE_RH_CLOUD_URL=https://x with the Hybrid Cloud endpoint you are connecting to.'
+  task hybridcloud_register: [:environment] do
+    include ::ForemanRhCloud::CertAuth
+    include ::InsightsCloud::CandlepinCache
+    
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    def registrations_url
+      logger.warn("Custom url is not set, using the default one: #{ForemanRhCloud.base_url}") if ENV['SATELLITE_RH_CLOUD_URL'].empty?
+      ForemanRhCloud.base_url + '/api/identity/certificate/registrations'
+    end
+
+    if ENV['org_id'].nil?
+      logger.error('ERROR: org_id needs to be specified.')
+      exit(1)
+    end
+    
+    organization = Organization.find_by(id: ENV['org_id'].to_i) # saw this coming in as a string, so making sure it gets passed as an integer.
+    
+    @uid = cp_owner_id(organization)
+    logger.error('Organization provided does not have a manifest imported.') + exit(1) if @uid.nil?
+
+    puts 'Paste your token, output will be hidden.'
+    @token = STDIN.noecho(&:gets).chomp
+    logger.error('Token was not entered.') + exit(1) if @token.empty?
+
+    def headers
+      {
+        Authorization: "Bearer #{@token}"
+      }
+    end
+
+    def payload
+      {
+        "uid": @uid
+      }
+    end
+
+    def method
+      :post
+    end
+
+    begin
+      response = execute_cloud_request(
+        organization: organization,
+        method: method,
+        url: registrations_url,
+        headers: headers,
+        payload: payload.to_json
+      )
+      logger.debug(response)
+    rescue Exception => ex
+      logger.error(ex)
+    end
+  end
+end