Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Remove double warning msg when adding cartridges
Browse files Browse the repository at this point in the history
bz1169690
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1169690

When adding cartridges to an app that is approaching quota limits,
the "Warning: Gear <uuid> is using <percent> of disk quota" is printed twice.
This PR removes the report_quota when installing a cartridge, so the
quota is only reported once after the cartridge is installed.
  • Loading branch information
sallyom committed Feb 29, 2016
1 parent e17f43f commit 3b977d0
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion plugins/msg-node/mcollective/src/openshift.rb
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,9 @@ def cartridge_do_action
exitcode, output, addtl_params = execute_action(action, args)

if args['--with-container-uuid']
report_quota(output, args['--with-container-uuid'])
if action.to_s.include?("post-configure") || action.to_s.include?("deconfigure")
report_quota(output, args['--with-container-uuid'])
end
if report_resource(output, args['--with-app-name'])
exitcode = 222
end
Expand Down

0 comments on commit 3b977d0

Please sign in to comment.