From cbe7788117a964bea16dd02274bdabd6c2b632a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 8 Apr 2014 18:15:38 +0200 Subject: [PATCH] Formatting for onegroup create help --- src/cli/one_helper.rb | 16 ++++++++-------- src/cli/onegroup | 6 +----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 7db81ff2aa..0f7c1979c4 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -147,7 +147,7 @@ EOT }, { :name => 'admin_password', - :large => '--admin_password password', + :large => '--admin_password pass', :short => "-p", :description => 'Password for the admin user of the group', @@ -155,7 +155,7 @@ EOT }, { :name => 'admin_driver', - :large => '--admin_driver auth_driver', + :large => '--admin_driver driver', :short => "-d", :description => 'Auth driver for the admin user of the group', @@ -163,20 +163,20 @@ EOT }, { :name => 'resources', - :large => '--resources resources_str', + :large => '--resources res_str', :short => "-r", :description => - 'Which resources can be created by group users "\ - "(VM+NET+IMAGE+TEMPLATE by default)', + "Which resources can be created by group users "<< + "(VM+NET+IMAGE+TEMPLATE by default)", :format => String }, { :name => 'admin_resources', - :large => '--admin_resources resources_str', + :large => '--admin_resources res_str', :short => "-o", :description => - 'Which resources can be created by group users "\ - "(VM+NET+IMAGE+TEMPLATE by default)', + "Which resources can be created by the admin user "<< + "(VM+NET+IMAGE+TEMPLATE by default)", :format => String } ] diff --git a/src/cli/onegroup b/src/cli/onegroup index 29eb5d03c9..8c3958af3d 100755 --- a/src/cli/onegroup +++ b/src/cli/onegroup @@ -79,17 +79,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do Examples: - - using a template description file: - - onegroup create group_description.tmpl - - create a group with admin user and allow group users to only create new templates and VMs, and group admin to manage templates, vms, images and virtual networks onegroup create --name groupA --admin_user admin_userA --admin_password somestr - --resource TEMPLATE+VM + --resources TEMPLATE+VM --admin_resources TEMPLATE+VM+IMAGE+NET EOT