shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Feature #2796: Update --force description

Browse Source
This commit is contained in:
Carlos Martín 2014-09-08 14:59:45 +02:00 committed by Ruben S. Montero
parent 65b148eeef
commit 8708f0222f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/one_helper/oneuser_helper.rb
View File

@ -162,7 +162,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
# Check that ONE_AUTH target can be written
#-----------------------------------------------------------------------
if File.file?(ONE_AUTH) && !options[:force]
return -1, "File #{ONE_AUTH} exists, use --force to overwirte"
return -1, "File #{ONE_AUTH} exists, use --force to overwrite"
end
#-----------------------------------------------------------------------
@ -348,8 +348,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
puts str % ["SECONDARY GROUPS", groups.join(',') ] if groups.size > 1
puts str % ["PASSWORD", user['PASSWORD']]
puts str % ["AUTH_DRIVER", user['AUTH_DRIVER']]
puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']]
puts str % ["VALIDITY", "not after #{Time.at(user['LOGIN_TOKEN/EXPIRATION_TIME'].to_i)}"] if !user['LOGIN_TOKEN/EXPIRATION_TIME'].nil?
puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']] if !user['LOGIN_TOKEN/TOKEN'].nil?
puts str % ["TOKEN VALIDITY", "not after #{Time.at(user['LOGIN_TOKEN/EXPIRATION_TIME'].to_i)}"] if !user['LOGIN_TOKEN/EXPIRATION_TIME'].nil?
puts str % ["ENABLED",
OpenNebulaHelper.boolean_to_str(user['ENABLED'])]

2
src/cli/oneuser
View File

@ -134,7 +134,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
FORCE = {
:name => "force",
:large => "--force" ,
:description => "Force probe upgrade in onehost sync"
:description => "Force one_auth file rewrite"
}
create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]