mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
appstage: Fix appstage client
This commit is contained in:
1 parent
8869cdc5db
commit
27f1f30b91
3 files changed
+15
-5
No files matched your search
+6
-1
@@ -99,12 +99,17 @@ COOKBOOKS={
|
||||
cmd = CommandParser::CmdParser.new(ARGV) do
|
||||
usage "`appstage` <command> [<args>] [<options>]"
|
||||
version OneApps::VERSION_TEXT
|
||||
|
||||
|
||||
set :option, CommandParser::VERSION
|
||||
|
||||
helper = AppStageHelper.new
|
||||
template_helper = OneTemplateHelper.new
|
||||
|
||||
before_proc do
|
||||
helper.set_client(options)
|
||||
template_helper.set_client(options)
|
||||
end
|
||||
|
||||
set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
|
||||
OpenNebulaHelper.rname_to_id(arg, "GROUP")
|
||||
end
|
||||
|
||||
@@ -40,7 +40,7 @@ private
|
||||
OpenNebula::ChefDocPool.new(@client, filter)
|
||||
end
|
||||
|
||||
def format_resource(node)
|
||||
def format_resource(node, options={})
|
||||
str_h1="%-80s"
|
||||
str="%-20s: %-20s"
|
||||
|
||||
@@ -88,7 +88,11 @@ private
|
||||
|
||||
CLIHelper.print_header(str_h1 % "NODE DEFINITION",false)
|
||||
|
||||
puts JSON.pretty_generate(node.node['node'])
|
||||
begin
|
||||
puts JSON.pretty_generate(node.node['node'])
|
||||
rescue
|
||||
puts ""
|
||||
end
|
||||
|
||||
puts
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ helpers do
|
||||
def appstage_create(template)
|
||||
node = OpenNebula::ChefConf.new
|
||||
node.description = template['description'] if template['description']
|
||||
node.cookbooks = template['cookbooks'] if template['cookbacks']
|
||||
node.cookbooks = template['cookbooks'] if template['cookbooks']
|
||||
node.templates = template['templates'] if template['templates']
|
||||
#variables currently unused
|
||||
node.variables = template['variables'] if template['variables']
|
||||
@@ -63,9 +63,10 @@ helpers do
|
||||
|
||||
def appstage_update(resource, template)
|
||||
node = resource.node
|
||||
node.node = template['node'] if template['node']
|
||||
node.node = template['node']
|
||||
node.templates = template['templates']
|
||||
node.cookbooks = template['cookbooks']
|
||||
node.description = template['description']
|
||||
resource.update(node.to_json)
|
||||
end
|
||||
|
||||
|
||||
Reference in new issue
Block a user