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
On 07/15/2011 11:48 AM, mtaylor@redhat.com wrote:
From: Martyn Taylormtaylor@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}"
beginif 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}"endquit(0) end
quit(0)
rescueputs "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 enddiff --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
ACK
Thomas
On 07/15/2011 05:48 AM, mtaylor@redhat.com wrote:
From: Martyn Taylormtaylor@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"
OK I'm a bit confused here. We just agreed that we would _not_ support pushing to one provider now and another provider later (the whole "latest_unpushed is null problem) since the two images won't be in sync (for snapshot images).
Doesn't that mean that the only correct way to push to both ec2 US-east and US-west would be to specify multiple providers on the push call?
Scott
Hi Scott,
There was some ambiguity with one of the BZs that this patch tried to address.
After some conversation with imcleod on Friday we've now cleared up how aoelus-image push should work. So this patch won't be going in.
Cheers
Martyn
----- Original Message ----- From: "Scott Seago" sseago@redhat.com To: aeolus-devel@lists.fedorahosted.org Sent: Saturday, 16 July, 2011 7:12:59 AM Subject: Re: [PATCH aeolus] BZ#721050 - Removed references to multiple provider push in docs
On 07/15/2011 05:48 AM, mtaylor@redhat.com wrote:
From: Martyn Taylormtaylor@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"
OK I'm a bit confused here. We just agreed that we would _not_ support pushing to one provider now and another provider later (the whole "latest_unpushed is null problem) since the two images won't be in sync (for snapshot images).
Doesn't that mean that the only correct way to push to both ec2 US-east and US-west would be to specify multiple providers on the push call?
Scott
_______________________________________________ aeolus-devel mailing list aeolus-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/aeolus-devel
aeolus-devel@lists.fedorahosted.org
-
Martyn Taylor -
Scott Seago -
Tomas Sedovic