From: Martyn Taylor mtaylor@redhat.com
--- .../aeolus-image/lib/config_parser.rb | 2 +- .../image_factory/aeolus-image/lib/push_command.rb | 25 ++++++++++++-------- .../aeolus-image/man/aeolus-image-push.1 | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/services/image_factory/aeolus-image/lib/config_parser.rb b/services/image_factory/aeolus-image/lib/config_parser.rb index c62b599..60b40cd 100644 --- a/services/image_factory/aeolus-image/lib/config_parser.rb +++ b/services/image_factory/aeolus-image/lib/config_parser.rb @@ -141,7 +141,7 @@ module Aeolus
opts.separator "" opts.separator "Push examples:" - opts.separator "aeolus-image push --provider ec2-us-east-1,my-rhev-m --id $image_id # push the image to the specified providers" + opts.separator "aeolus-image push --provider ec2-us-east-1 --id $image_id # push the image to the specified provider" opts.separator "aeolus-image push --build $build_id # (NOT IMPLEMENTED) push all target images for a build, to same providers as previously" opts.separator "aeolus-image push --account $provider_account --build $build_id # (NOT IMPLEMENTED) ditto, using a specific provider account" opts.separator "aeolus-image push --image $image_id # (NOT IMPLEMENTED) push all the target images for the latest build" diff --git a/services/image_factory/aeolus-image/lib/push_command.rb b/services/image_factory/aeolus-image/lib/push_command.rb index ae79f14..69a0776 100644 --- a/services/image_factory/aeolus-image/lib/push_command.rb +++ b/services/image_factory/aeolus-image/lib/push_command.rb @@ -16,17 +16,22 @@ module Aeolus @console.start end def run - if combo_implemented? - sleep(5) - @console.push(@options[:provider], get_creds, @options[:id], @options[:build]).each do |adaptor| - puts "" - puts "Provider Image: #{adaptor.image_id}" - puts "Image: #{adaptor.image}" - puts "Build: #{adaptor.build}" - puts "Status: #{adaptor.status}" - puts "Percent Complete: #{adaptor.percent_complete}" + begin + if combo_implemented? + sleep(5) + @console.push(@options[:provider], get_creds, @options[:id], @options[:build]).each do |adaptor| + puts "" + puts "Provider Image: #{adaptor.image_id}" + puts "Image: #{adaptor.image}" + puts "Build: #{adaptor.build}" + puts "Status: #{adaptor.status}" + puts "Percent Complete: #{adaptor.percent_complete}" + end + quit(0) end - quit(0) + rescue + puts "An Error occured whilst trying to push this build, please check aeolus-image --help for details on how to use this command" + quit(1) end end
diff --git a/services/image_factory/aeolus-image/man/aeolus-image-push.1 b/services/image_factory/aeolus-image/man/aeolus-image-push.1 index 2f92c0f..76fab4e 100644 --- a/services/image_factory/aeolus-image/man/aeolus-image-push.1 +++ b/services/image_factory/aeolus-image/man/aeolus-image-push.1 @@ -14,7 +14,7 @@ Conductor username Conductor password .TP -r|--provider -The a list of the provider names this image should be pushed to +The provider name this image should be pushed to .TP --id <id> The id of the image for pushing