Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP] Foreman 3.9 cherrypick and version bump to 9.0.56 #881

Merged
merged 2 commits into from
Apr 29, 2024
Merged

[CP] Foreman 3.9 cherrypick and version bump to 9.0.56 #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7206dc
Fix scheduled task for uploading report failed (#874)
sbernhard Mar 22, 2024
c21778f
Bump version to 9.0.56
chris1984 Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/api/v2/rh_cloud/inventory_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ def download_file

api :POST, "/organizations/:organization_id/rh_cloud/report", N_("Start report generation")
param :organization_id, Integer, required: true, desc: N_("Set the current organization context for the request")
param :disconnected, :bool, required: false, desc: N_('Generate the report, but do not upload')
param :disconnected, :bool, required: false, default: false, desc: N_('Generate the report, but do not upload')
def generate_report
organization_id = params[:organization_id]
disconnected = params[:disconnected]
disconnected = params[:disconnected] || false

start_report_generation(organization_id, disconnected)

Expand Down
3 changes: 2 additions & 1 deletion lib/foreman_inventory_upload/async/generate_all_reports_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ def plan
total_hosts = ForemanInventoryUpload::Generators::Queries.for_org(organization.id, use_batches: false).count

if total_hosts <= ForemanInventoryUpload.max_org_size
plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization)
disconnected = false
plan_generate_report(ForemanInventoryUpload.generated_reports_folder, organization, disconnected)
else
logger.info("Skipping automatic uploads for organization #{organization.name}, too many hosts (#{total_hosts}/#{ForemanInventoryUpload.max_org_size})")
end
Expand Down
2 changes: 1 addition & 1 deletion lib/foreman_rh_cloud/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ForemanRhCloud
VERSION = '9.0.55'.freeze
VERSION = '9.0.56'.freeze
end
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foreman_rh_cloud",
"version": "9.0.51",
"version": "9.0.56",
"description": "Inventory Upload =============",
"main": "index.js",
"scripts": {
Expand Down
Loading