From: Martyn Taylor <mtaylor(a)redhat.com>
---
README.md | 4 +-
Rakefile | 4 +-
bin/aeolus-cli | 20 +++++++
bin/aeolus-image | 20 -------
lib/aeolus_cli/command/config_parser.rb | 48 ++++++++--------
man/aeolus-cli-build.1 | 36 +++++++++++++
man/aeolus-cli-import.1 | 57 ++++++++++++++++++++
man/aeolus-cli-list.1 | 88 +++++++++++++++++++++++++++++++
man/aeolus-cli-push.1 | 43 +++++++++++++++
man/aeolus-cli.1 | 16 ++++++
man/aeolus-image-build.1 | 36 -------------
man/aeolus-image-import.1 | 57 --------------------
man/aeolus-image-list.1 | 88 -------------------------------
man/aeolus-image-push.1 | 43 ---------------
man/aeolus-image.1 | 16 ------
rubygem-aeolus-cli.spec | 5 ++-
16 files changed, 292 insertions(+), 289 deletions(-)
create mode 100755 bin/aeolus-cli
delete mode 100755 bin/aeolus-image
create mode 100644 man/aeolus-cli-build.1
create mode 100644 man/aeolus-cli-import.1
create mode 100644 man/aeolus-cli-list.1
create mode 100644 man/aeolus-cli-push.1
create mode 100644 man/aeolus-cli.1
delete mode 100644 man/aeolus-image-build.1
delete mode 100644 man/aeolus-image-import.1
delete mode 100644 man/aeolus-image-list.1
delete mode 100644 man/aeolus-image-push.1
delete mode 100644 man/aeolus-image.1
diff --git a/README.md b/README.md
index cc2cd35..3eea28a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# aeolus-image #
+# aeolus-cli #
-**aeolus-image** is a command-line tool for building images for the cloud and pushing
them to providers. It is a component of the [Aeolus
Project](https://www.aeolusproject.org/) and it functions by working with the REST API
exposed by Aeolus Conductor. (It does not build or push images on its own.)
+**aeolus-cli** is a command-line tool for building images for the cloud and pushing them
to providers. It is a component of the [Aeolus
Project](https://www.aeolusproject.org/)
and it functions by working with the REST API exposed by Aeolus Conductor. (It does not
build or push images on its own.)
## Usage Samples ##
Right now, [this wiki
page](https://www.aeolusproject.org/redmine/projects/aeolus/wiki/Launchin... is
your best bet for up-to-date documentation.
diff --git a/Rakefile b/Rakefile
index bee01f7..8dd3dcf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,7 +33,7 @@ spec = Gem::Specification.new do |s|
s.email = 'jguiditt(a)redhat.com, mtaylor(a)redhat.com'
s.license = 'ASL 2.0'
s.homepage = 'http://aeolusproject.org'
- s.executables << 'aeolus-image'
+ s.executables << 'aeolus-cli'
s.files = %w(Rakefile) + Dir.glob("{bin,lib,spec,examples,man}/**/*") +
%w(COPYING)
s.require_path = "lib"
s.bindir = "bin"
@@ -54,7 +54,7 @@ Rake::RDocTask.new do |rdoc|
files =['README', 'COPYING', 'lib/**/*.rb']
rdoc.rdoc_files.add(files)
rdoc.main = "README" # page to start on
- rdoc.title = "aeolus-image Docs"
+ rdoc.title = "aeolus-cli Docs"
rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
rdoc.options << '--line-numbers'
end
diff --git a/bin/aeolus-cli b/bin/aeolus-cli
new file mode 100755
index 0000000..f3af29b
--- /dev/null
+++ b/bin/aeolus-cli
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# Copyright 2011 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#
http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'aeolus_cli'
+parser = Aeolus::CLI::ConfigParser.new(ARGV)
+puts parser.process
diff --git a/bin/aeolus-image b/bin/aeolus-image
deleted file mode 100755
index f3af29b..0000000
--- a/bin/aeolus-image
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright 2011 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#
http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$: << File.expand_path(File.dirname(__FILE__) + '/../lib')
-require 'aeolus_cli'
-parser = Aeolus::CLI::ConfigParser.new(ARGV)
-puts parser.process
diff --git a/lib/aeolus_cli/command/config_parser.rb
b/lib/aeolus_cli/command/config_parser.rb
index e6afe08..ccde0e3 100644
--- a/lib/aeolus_cli/command/config_parser.rb
+++ b/lib/aeolus_cli/command/config_parser.rb
@@ -46,7 +46,7 @@ module Aeolus
private
def parse
@optparse ||= OptionParser.new do|opts|
- opts.banner = "Usage: aeolus-image [#{COMMANDS.join('|')}]
[general options] [command options]"
+ opts.banner = "Usage: aeolus-cli [#{COMMANDS.join('|')}] [general
options] [command options]"
opts.separator ""
opts.separator "General options:"
@@ -136,41 +136,41 @@ module Aeolus
opts.separator ""
opts.separator "List Examples:"
- opts.separator "aeolus-image list --images # list
available images"
- opts.separator "aeolus-image list --builds $image_id # list the
builds of an image"
- opts.separator "aeolus-image list --targetimages $build_id # list the
target images from a build"
- opts.separator "aeolus-image list --providerimages $target_id # list the
provider images from a target image"
- opts.separator "aeolus-image list --targets # list the
values available for the --target parameter"
- opts.separator "aeolus-image list --providers # list the
values available for the --provider parameter"
- opts.separator "aeolus-image list --accounts # list the
values available for the --account parameter"
+ opts.separator "aeolus-cli list --images # list
available images"
+ opts.separator "aeolus-cli list --builds $image_id # list the
builds of an image"
+ opts.separator "aeolus-cli list --targetimages $build_id # list the
target images from a build"
+ opts.separator "aeolus-cli list --providerimages $target_id # list the
provider images from a target image"
+ opts.separator "aeolus-cli list --targets # list the
values available for the --target parameter"
+ opts.separator "aeolus-cli list --providers # list the
values available for the --provider parameter"
+ opts.separator "aeolus-cli list --accounts # list the
values available for the --account parameter"
opts.separator ""
opts.separator "Build examples:"
- opts.separator "aeolus-image build --target ec2 --template my.tmpl
# build a new image for ec2 from based on the given template"
- opts.separator "aeolus-image build --target ec2,rhevm --template my.tmpl
# build a new image for ec2 and for rhevm based on the given template"
- #opts.separator "aeolus-image build --image $image_id #
(NOT IMPLEMENTED) rebuild the image template and targets from latest build"
- #opts.separator %q{aeolus-image build --target ec2,rackspace \ #
rebuild the image with a new template and set of targets
+ opts.separator "aeolus-cli build --target ec2 --template my.tmpl #
build a new image for ec2 from based on the given template"
+ opts.separator "aeolus-cli build --target ec2,rhevm --template my.tmpl #
build a new image for ec2 and for rhevm based on the given template"
+ #opts.separator "aeolus-cli build --image $image_id # (NOT
IMPLEMENTED) rebuild the image template and targets from latest build"
+ #opts.separator %q{aeolus-cli build --target ec2,rackspace \ # rebuild
the image with a new template and set of targets
# --image $image_i \
# --template my.tmpl}
opts.separator ""
opts.separator "Push examples:"
- opts.separator "aeolus-image push --account ec2-account,ec2-account2
--targetimage $target_image_id # Push target images to each of the specified
account"
- opts.separator "aeolus-image push --account ec2-account,rhevm-account
--build $build_id # Push target images attached to a particular build to
each of the specified accounts"
- opts.separator "aeolus-image push --account ec2-account,rhevm-account
--image $image_id # Push target images attached to a particular image to
each of the specified accounts"
+ opts.separator "aeolus-cli push --account ec2-account,ec2-account2
--targetimage $target_image_id # Push target images to each of the specified
account"
+ opts.separator "aeolus-cli push --account ec2-account,rhevm-account
--build $build_id # Push target images attached to a particular build to
each of the specified accounts"
+ opts.separator "aeolus-cli push --account ec2-account,rhevm-account
--image $image_id # Push target images attached to a particular image to
each of the specified accounts"
opts.separator ""
opts.separator "Import examples:"
- opts.separator "aeolus-image import --provider ec2-us-east-1 --target ec2
--id $ami_id # import an AMI from the specified provider"
- opts.separator "aeolus-image import --provider ec2-us-east-1 --target ec2
--id $ami_id --description '<image><name>My
Image</name></image>' # import an AMI from the specified provider"
- opts.separator "aeolus-image import --provider ec2-us-east-1 --target ec2
--id $ami_id --description <path_to_xml_file> # import an AMI from the specified
provider"
+ opts.separator "aeolus-cli import --provider ec2-us-east-1 --target ec2
--id $ami_id # import an AMI from the specified provider"
+ opts.separator "aeolus-cli import --provider ec2-us-east-1 --target ec2
--id $ami_id --description '<image><name>My
Image</name></image>' # import an AMI from the specified provider"
+ opts.separator "aeolus-cli import --provider ec2-us-east-1 --target ec2
--id $ami_id --description <path_to_xml_file> # import an AMI from the specified
provider"
opts.separator ""
opts.separator "Delete examples: (DELETE CURRENTLY NOT IMPLEMENTED)
"
- opts.separator "aeolus-image delete --image $image_id #
deletes a image and all associated builds"
- opts.separator "aeolus-image delete --build $build_id #
deletes a build and all associated targetimages"
- opts.separator "aeolus-image delete --targetimage $target_image #
deletes a target image and all associated provider images"
- opts.separator "aeolus-image delete --providerimage $provider_image #
deletes a provider image"
+ opts.separator "aeolus-cli delete --image $image_id #
deletes a image and all associated builds"
+ opts.separator "aeolus-cli delete --build $build_id #
deletes a build and all associated targetimages"
+ opts.separator "aeolus-cli delete --targetimage $target_image #
deletes a target image and all associated provider images"
+ opts.separator "aeolus-cli delete --providerimage $provider_image #
deletes a provider image"
end
begin
@@ -195,7 +195,7 @@ module Aeolus
# self.send(@options[:subcommand])
if @options[:subcommand].nil?
# TODO: Pull out Print Usage into seporate method, and print
- puts "Could not find subcommand for list, run `./aeolus-image --help` for
usage instructions"
+ puts "Could not find subcommand for list, run `./aeolus-cli --help` for
usage instructions"
exit(1)
else
list_command = ListCommand.new(@options)
@@ -221,7 +221,7 @@ module Aeolus
def delete
if @options[:subcommand].nil?
# TODO: Pull out Print Usage into seporate method, and print
- puts "Could not find subcommand for delete, run `./aeolus-image --help`
for usage instructions"
+ puts "Could not find subcommand for delete, run `./aeolus-cli --help` for
usage instructions"
exit(1)
else
delete_command = DeleteCommand.new(@options)
diff --git a/man/aeolus-cli-build.1 b/man/aeolus-cli-build.1
new file mode 100644
index 0000000..b3e4332
--- /dev/null
+++ b/man/aeolus-cli-build.1
@@ -0,0 +1,36 @@
+.TH aeolus-cli 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
+.SH NAME
+aeolus-cli build \- command for building aeolus images
+.SH SYNOPSIS
+.B aeolus-cli build [\-h|--help] [\-u|--username] [\-w|--password] [\-I|--image
[image-id]] [\-e|--template [path-to-template]] [\-t|--targets [targets]] [\-d|--daemon]
+.SH DESCRIPTION
+aeolus-cli build command allows users to build new images based on a given TDL template
file for a set of specified targets such e.g. EC2, RHEVM etc... See list man list
target-images for information on how to list the completed builds.
+.SH OPTIONS
+.TP
+\-u, --user <username>
+Conductor username
+.TP
+\-w, --password <password>
+Conductor password
+.TP
+\-T, --target
+Provide a list of targets for the build
+.TP
+\-e, --template
+Provide path to a TDL template file for building against
+.TP
+\-d, --daemon
+Run as a background process
+.TP
+Get usage information for this command and associated commmands
+\-h, --help
+.SH EXAMPLES
+.TP
+Build a new image for ec2 based on the specified template TDL file template.tdl
+.B aeolus-cli build
+\--targets ec2
+\--template ./template.tdl
+.TP
+Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
+.SH SEE ALSO
+aeolus-cli-list(1), aeolus-cli-push(1), aeolus-cli-import(1)
diff --git a/man/aeolus-cli-import.1 b/man/aeolus-cli-import.1
new file mode 100644
index 0000000..6ab05ee
--- /dev/null
+++ b/man/aeolus-cli-import.1
@@ -0,0 +1,57 @@
+.TH aeolus-cli 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
+.SH NAME
+aeolus-cli import \- command for importing existing provider images into aeolus
+.SH SYNOPSIS
+.B aeolus-cli import [\-h|--help] [\-u|--username] [\-w|--password] [\-r|--provider
[provider-name]] [\--id [provider-image-id]] [--description [path-to-file|xml string]]
[\T|--target [target]] [\-d|--daemon]
+.SH DESCRIPTION
+aeolus-cli import allows users to import pre-existing images that exist in cloud provders
for example AMI from EC2, into aeolus.
+.SH OPTIONS
+.TP
+\-u, --user <username>
+Conductor username
+.TP
+\-w, --password <password>
+Conductor password
+.TP
+\-r, --provider <provider-name>
+The provider name as it exists in conductor from where the importing image resides
+.TP
+\--id <provider-image-id>
+The providers ID given to the importing image
+.TP
+\-T, --target
+The target type for the given provider
+.TP
+\--description <path-to-xml-description|xml string>
+A user defined description to associate with the importing image
+.TP
+\-d, --daemon
+Run as a background process
+.TP
+Get usage information for this command and associated commmands
+\-h, --help
+.SH EXAMPLES
+.TP
+Import the AMI ami-1234567 from the provider ec2-us-east-1 into aeolus
+.B aeolus-cli import
+\--provider ec2-us-east-1
+\--target ec2
+\--id ami-1234567
+.TP
+Import the AMI ami-1234567 from the provider ec2-us-west-1 into aeolus with a given xml
description
+.B aeolus-cli import
+\--provider ec2-us-west-1
+\--target ec2
+\--id ami-1234567
+\--description '<image><name>myAMI</name></image>'
+.TP
+Import the AMI ami-1234567 from the provider ec2-us-west-1 into aeolus providing a path
to the description XML file
+.B aeolus-cli import
+\--provider ec2-us-west-1
+\--target ec23
+\--id ami-1234567
+\--description /foo/bar/description.xml
+.SH AUTHOR
+Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
+.SH SEE ALSO
+aeolus-cli-list(1), aeolus-cli-push(1), aeolus-cli-build(1)
diff --git a/man/aeolus-cli-list.1 b/man/aeolus-cli-list.1
new file mode 100644
index 0000000..d8b0dde
--- /dev/null
+++ b/man/aeolus-cli-list.1
@@ -0,0 +1,88 @@
+.TH aeolus-cli 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
+.SH NAME
+aeolus-cli \- command for listing aeolus image associated objects.
+.SH SYNOPSIS
+.B aeolus-cli list [\-h|--help] [\-u|--username] [\-w|--password] [\-i|--images]
[\-b|--builds [image id]] [\-t|--targetimages [build id]] [\-P|--providerimages [target
image id]] [\-g|--targets] [\-a|--accounts] [\-p|--providers]
+.SH DESCRIPTION
+aeolus-cli list commands allows users to list information on the contents of particular
objects in image warehouse including:
+.P
+images: high level image representation associated with underlying provider and target
images
+.br
+builds: an object representation of a particular build that has taken place for a high
level image
+.br
+targets: particular targets available to build against, for example 'ec2'
+.br
+targetimages: represents builds of particular image against a target. For example
building against target 'ec2' would create an AMI specific image
+.br
+providerimages: represents the actual images that have been uploaded to a provider.
Similiar to a target image but specific to a particular provider
+.SH OPTIONS
+.TP
+\-u, --user <username>
+Conductor username
+.TP
+\-w, --password <password>
+Conductor password
+Get usage information for this command and associated commmands
+.TP
+\-i, --images
+Retrieve a list of images
+.TP
+\-b, --builds <image id>
+Retrieve a list of builds of for a particular image
+.TP
+\-t, --targetimages <build id>
+Retrieve a list of completed target-images builds for a particular build id
+.TP
+\-P, --providerimages <target image id>
+Retrieve a list of completed provider-images builds for a particular target image id. Use
"all" to list all provider images.
+.TP
+\-g, --targets
+Retrieve a list of available targets
+.TP
+\-p, --providers
+Retrieve a list of available providers
+.TP
+\-a, --accounts
+Retrieve a list of available accounts
+.TP
+\-d, --daemon
+Run as a background process
+.TP
+\-h, --help
+.SH EXAMPLES
+.TP
+List all images
+.B aeolus-cli list
+\--images
+.TP
+List all builds for an image with id: 12345678-aaaa-1234--1234567890ab
+.B aeolus-cli list
+\--builds 12345678-aaaa-1234--1234567890ab
+.TP
+List all target images for a given build with id: 12345678-bbbb-1234--1234567890ab
+.B aeolus-cli list
+\--targetimages 12345678-bbbb-1234--1234567890ab
+.TP
+List all provider images for a given target image with id:
12345678-tttt-1234--1234567890ab
+.B aeolus-cli list
+\--providerimages 12345678-tttt-1234--1234567890ab
+.TP
+List all provider images
+.B aeolus-cli list
+\--providerimages all
+.TP
+List all available targets
+.B aeolus-cli list
+\--targets
+.TP
+List all available providers
+.B aeolus-cli list
+\--providers
+.TP
+List all available accounts
+.B aeolus-cli list
+\--account
+.SH AUTHOR
+Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
+.SH SEE ALSO
+aeolus-cli-build(1), aeolus-cli-push(1), aeolus-cli-import(1), aeolus-cli-delete(1)
diff --git a/man/aeolus-cli-push.1 b/man/aeolus-cli-push.1
new file mode 100644
index 0000000..dfc4848
--- /dev/null
+++ b/man/aeolus-cli-push.1
@@ -0,0 +1,43 @@
+.TH aeolus-cli 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
+.SH NAME
+aeolus-cli push \- command for pushing aeolus images to back end providers
+.SH SYNOPSIS
+.B aeolus-cli push [\-h|--help] [\-I|--image [image-id]] [\-B|--build [build-id]]
[-m|--targetimage]] [-A|--account[account-name]]
+.SH DESCRIPTION
+aeolus-cli push allows users to push target images to particular backend providers.
+.SH OPTIONS
+.TP
+\-I|--image <id>
+The image id for pushing all target images associated with this image
+.TP
+\-B|--build <id>
+The build id for pushing all target images associated with this build
+.TP
+\-m|--targetimage <id>
+The id of the target image to push
+.TP
+\-A|--account <id>
+A comma separated list of account that the target images should be pushed to
+.TP
+Get usage information for this command and associated commmands
+\-h, --help
+.SH EXAMPLES
+.TP
+Push target images associated with an image to each of specified accounts
+.B aeolus-cli push
+\--image 12345678-bbbb-1234--1234567890ab
+\--account ec2-account,rhevm-account
+.TP
+Push target images associated with a build to each of the specified accounts
+.B aeolus-cli push
+\--build 12345678-bbbb-1234--1234567890ab
+\--account ec2-account,rhevm-account
+.TP
+Push a target image to each of the specified accounts
+.B aeolus-cli push
+\--targetimage 12345678-bbbb-1234--1234567890ab
+\--account ec2-account,ec2-account2
+.SH AUTHOR
+Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
+.SH SEE ALSO
+aeolus-cli-list(1), aeolus-cli-build(1), aeolus-cli-import(1)
diff --git a/man/aeolus-cli.1 b/man/aeolus-cli.1
new file mode 100644
index 0000000..9275be4
--- /dev/null
+++ b/man/aeolus-cli.1
@@ -0,0 +1,16 @@
+.TH aeolus-cli 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
+.SH NAME
+aeolus-cli \- command line tool for managing aeolus images
+.SH SYNOPSIS
+.B aeolus-cli
+[\-h]
+.SH DESCRIPTION
+aeolus-cli is a tool that allows users to control their aeolus images through image
builder and aeolus conductor. aeolus-cli offers four commands options; list, build, push,
import. For more information on each command please run man aeolus-cli <command> or
aeolus-cli --help
+.SH OPTIONS
+.TP
+\-h, --help
+Get usage information for this tool and subcommands
+.SH AUTHOR
+Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
+.SH SEE ALSO
+aeolus-cli-build(1), aeolus-cli-push(1), aeolus-cli-list(1), aeolus-cli-import(1)
diff --git a/man/aeolus-image-build.1 b/man/aeolus-image-build.1
deleted file mode 100644
index 9a381ee..0000000
--- a/man/aeolus-image-build.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH aeolus-image 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
-.SH NAME
-aeolus-image build \- command for building aeolus images
-.SH SYNOPSIS
-.B aeolus-image build [\-h|--help] [\-u|--username] [\-w|--password] [\-I|--image
[image-id]] [\-e|--template [path-to-template]] [\-t|--targets [targets]] [\-d|--daemon]
-.SH DESCRIPTION
-aeolus-image build command allows users to build new images based on a given TDL template
file for a set of specified targets such e.g. EC2, RHEVM etc... See list man list
target-images for information on how to list the completed builds.
-.SH OPTIONS
-.TP
-\-u, --user <username>
-Conductor username
-.TP
-\-w, --password <password>
-Conductor password
-.TP
-\-T, --target
-Provide a list of targets for the build
-.TP
-\-e, --template
-Provide path to a TDL template file for building against
-.TP
-\-d, --daemon
-Run as a background process
-.TP
-Get usage information for this command and associated commmands
-\-h, --help
-.SH EXAMPLES
-.TP
-Build a new image for ec2 based on the specified template TDL file template.tdl
-.B aeolus-image build
-\--targets ec2
-\--template ./template.tdl
-.TP
-Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
-.SH SEE ALSO
-aeolus-image-list(1), aeolus-image-push(1), aeolus-image-import(1)
diff --git a/man/aeolus-image-import.1 b/man/aeolus-image-import.1
deleted file mode 100644
index 82ee0ce..0000000
--- a/man/aeolus-image-import.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.TH aeolus-image 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
-.SH NAME
-aeolus-image import \- command for importing existing provider images into aeolus
-.SH SYNOPSIS
-.B aeolus-image import [\-h|--help] [\-u|--username] [\-w|--password] [\-r|--provider
[provider-name]] [\--id [provider-image-id]] [--description [path-to-file|xml string]]
[\T|--target [target]] [\-d|--daemon]
-.SH DESCRIPTION
-aeolus-image import allows users to import pre-existing images that exist in cloud
provders for example AMI from EC2, into aeolus.
-.SH OPTIONS
-.TP
-\-u, --user <username>
-Conductor username
-.TP
-\-w, --password <password>
-Conductor password
-.TP
-\-r, --provider <provider-name>
-The provider name as it exists in conductor from where the importing image resides
-.TP
-\--id <provider-image-id>
-The providers ID given to the importing image
-.TP
-\-T, --target
-The target type for the given provider
-.TP
-\--description <path-to-xml-description|xml string>
-A user defined description to associate with the importing image
-.TP
-\-d, --daemon
-Run as a background process
-.TP
-Get usage information for this command and associated commmands
-\-h, --help
-.SH EXAMPLES
-.TP
-Import the AMI ami-1234567 from the provider ec2-us-east-1 into aeolus
-.B aeolus-image import
-\--provider ec2-us-east-1
-\--target ec2
-\--id ami-1234567
-.TP
-Import the AMI ami-1234567 from the provider ec2-us-west-1 into aeolus with a given xml
description
-.B aeolus-image import
-\--provider ec2-us-west-1
-\--target ec2
-\--id ami-1234567
-\--description '<image><name>myAMI</name></image>'
-.TP
-Import the AMI ami-1234567 from the provider ec2-us-west-1 into aeolus providing a path
to the description XML file
-.B aeolus-image import
-\--provider ec2-us-west-1
-\--target ec23
-\--id ami-1234567
-\--description /foo/bar/description.xml
-.SH AUTHOR
-Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
-.SH SEE ALSO
-aeolus-image-list(1), aeolus-image-push(1), aeolus-image-build(1)
diff --git a/man/aeolus-image-list.1 b/man/aeolus-image-list.1
deleted file mode 100644
index b75206a..0000000
--- a/man/aeolus-image-list.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.TH aeolus-image 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
-.SH NAME
-aeolus-image \- command for listing aeolus image associated objects.
-.SH SYNOPSIS
-.B aeolus-image list [\-h|--help] [\-u|--username] [\-w|--password] [\-i|--images]
[\-b|--builds [image id]] [\-t|--targetimages [build id]] [\-P|--providerimages [target
image id]] [\-g|--targets] [\-a|--accounts] [\-p|--providers]
-.SH DESCRIPTION
-aeolus-image list commands allows users to list information on the contents of particular
objects in image warehouse including:
-.P
-images: high level image representation associated with underlying provider and target
images
-.br
-builds: an object representation of a particular build that has taken place for a high
level image
-.br
-targets: particular targets available to build against, for example 'ec2'
-.br
-targetimages: represents builds of particular image against a target. For example
building against target 'ec2' would create an AMI specific image
-.br
-providerimages: represents the actual images that have been uploaded to a provider.
Similiar to a target image but specific to a particular provider
-.SH OPTIONS
-.TP
-\-u, --user <username>
-Conductor username
-.TP
-\-w, --password <password>
-Conductor password
-Get usage information for this command and associated commmands
-.TP
-\-i, --images
-Retrieve a list of images
-.TP
-\-b, --builds <image id>
-Retrieve a list of builds of for a particular image
-.TP
-\-t, --targetimages <build id>
-Retrieve a list of completed target-images builds for a particular build id
-.TP
-\-P, --providerimages <target image id>
-Retrieve a list of completed provider-images builds for a particular target image id. Use
"all" to list all provider images.
-.TP
-\-g, --targets
-Retrieve a list of available targets
-.TP
-\-p, --providers
-Retrieve a list of available providers
-.TP
-\-a, --accounts
-Retrieve a list of available accounts
-.TP
-\-d, --daemon
-Run as a background process
-.TP
-\-h, --help
-.SH EXAMPLES
-.TP
-List all images
-.B aeolus-image list
-\--images
-.TP
-List all builds for an image with id: 12345678-aaaa-1234--1234567890ab
-.B aeolus-image list
-\--builds 12345678-aaaa-1234--1234567890ab
-.TP
-List all target images for a given build with id: 12345678-bbbb-1234--1234567890ab
-.B aeolus-image list
-\--targetimages 12345678-bbbb-1234--1234567890ab
-.TP
-List all provider images for a given target image with id:
12345678-tttt-1234--1234567890ab
-.B aeolus-image list
-\--providerimages 12345678-tttt-1234--1234567890ab
-.TP
-List all provider images
-.B aeolus-image list
-\--providerimages all
-.TP
-List all available targets
-.B aeolus-image list
-\--targets
-.TP
-List all available providers
-.B aeolus-image list
-\--providers
-.TP
-List all available accounts
-.B aeolus-image list
-\--account
-.SH AUTHOR
-Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
-.SH SEE ALSO
-aeolus-image-build(1), aeolus-image-push(1), aeolus-image-import(1),
aeolus-image-delete(1)
diff --git a/man/aeolus-image-push.1 b/man/aeolus-image-push.1
deleted file mode 100644
index 2c0c194..0000000
--- a/man/aeolus-image-push.1
+++ /dev/null
@@ -1,43 +0,0 @@
-.TH aeolus-image 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
-.SH NAME
-aeolus-image push \- command for pushing aeolus images to back end providers
-.SH SYNOPSIS
-.B aeolus-image push [\-h|--help] [\-I|--image [image-id]] [\-B|--build [build-id]]
[-m|--targetimage]] [-A|--account[account-name]]
-.SH DESCRIPTION
-aeolus-image push allows users to push target images to particular backend providers.
-.SH OPTIONS
-.TP
-\-I|--image <id>
-The image id for pushing all target images associated with this image
-.TP
-\-B|--build <id>
-The build id for pushing all target images associated with this build
-.TP
-\-m|--targetimage <id>
-The id of the target image to push
-.TP
-\-A|--account <id>
-A comma separated list of account that the target images should be pushed to
-.TP
-Get usage information for this command and associated commmands
-\-h, --help
-.SH EXAMPLES
-.TP
-Push target images associated with an image to each of specified accounts
-.B aeolus-image push
-\--image 12345678-bbbb-1234--1234567890ab
-\--account ec2-account,rhevm-account
-.TP
-Push target images associated with a build to each of the specified accounts
-.B aeolus-image push
-\--build 12345678-bbbb-1234--1234567890ab
-\--account ec2-account,rhevm-account
-.TP
-Push a target image to each of the specified accounts
-.B aeolus-image push
-\--targetimage 12345678-bbbb-1234--1234567890ab
-\--account ec2-account,ec2-account2
-.SH AUTHOR
-Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
-.SH SEE ALSO
-aeolus-image-list(1), aeolus-image-build(1), aeolus-image-import(1)
diff --git a/man/aeolus-image.1 b/man/aeolus-image.1
deleted file mode 100644
index 7e7cc04..0000000
--- a/man/aeolus-image.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH aeolus-image 1 "July 07, 2011" "version 0.4" "USER
COMMANDS"
-.SH NAME
-aeolus-image \- command line tool for managing aeolus images
-.SH SYNOPSIS
-.B aeolus-image
-[\-h]
-.SH DESCRIPTION
-aeolus-image is a tool that allows users to control their aeolus images through image
builder and aeolus conductor. aeolus-image offers four commands options; list, build,
push, import. For more information on each command please run man aeolus-image
<command> or aeolus-image --help
-.SH OPTIONS
-.TP
-\-h, --help
-Get usage information for this tool and subcommands
-.SH AUTHOR
-Martyn Taylor (mtaylor(a)redhat.com), Jason Guiditta (jguiditta(a)redhat.com)
-.SH SEE ALSO
-aeolus-image-build(1), aeolus-image-push(1), aeolus-image-list(1),
aeolus-image-import(1)
diff --git a/rubygem-aeolus-cli.spec b/rubygem-aeolus-cli.spec
index 50a9568..2cd6a5c 100644
--- a/rubygem-aeolus-cli.spec
+++ b/rubygem-aeolus-cli.spec
@@ -60,7 +60,7 @@ mv %{buildroot}%{geminstdir}/man/* %{buildroot}%{mandir}
%files
%doc %{geminstdir}/COPYING
-%{_bindir}/aeolus-image
+%{_bindir}/aeolus-cli
%dir %{geminstdir}
%{geminstdir}/Rakefile
%{geminstdir}/bin
@@ -74,6 +74,9 @@ mv %{buildroot}%{geminstdir}/man/* %{buildroot}%{mandir}
%{mandir}/*
%changelog
+* Wed Nov 9 2011 Martyn Taylor <mmorsi(a)redhat.com> - 0.0.1-4
+- Renamed Bin file to aeolus-cli
+
* Wed Jul 20 2011 Mo Morsi <mmorsi(a)redhat.com> - 0.0.1-3
- more updates to conform to fedora guidelines
--
1.7.6.4