1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-26 10:03:37 +03:00

F #3064: fix minor bugs (#3728)

This commit is contained in:
Alejandro Huertas Herrero 2019-09-18 16:09:39 +02:00 committed by Ruben S. Montero
parent 4b4edb6460
commit 82bcbbf4c9
3 changed files with 7 additions and 2 deletions

View File

@ -116,7 +116,8 @@ CommandParser::CmdParser.new(ARGV) do
Shows information for the given Cluster
EOT
command :show, show_desc, :clusterid, :options => OpenNebulaHelper::XML do
command :show, show_desc, :clusterid,
:options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
helper.show_resource(args[0], options)
end

View File

@ -158,7 +158,8 @@ CommandParser::CmdParser.new(ARGV) do
Shows information for the given Datastore
EOT
command :show, show_desc, :datastoreid, :options => OpenNebulaHelper::XML do
command :show, show_desc, :datastoreid,
:options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
helper.show_resource(args[0], options)
end

View File

@ -641,6 +641,9 @@ int Datastore::insert(SqlDB *db, string& error_str)
replace_template_attribute("RESTRICTED_DIRS", "/");
}
// Encrypt all the secrets
encrypt();
//--------------------------------------------------------------------------
// Insert the Datastore
//--------------------------------------------------------------------------