From 2cdf971d68d5a0a53af6714042fd879e1632cabc Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Sat, 9 Feb 2019 06:54:54 -0600 Subject: [PATCH] F #1684: Add - LXD suffix to marketplaceapps from linuxcontainers --- src/market_mad/remotes/linuxcontainers/monitor | 2 +- src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/market_mad/remotes/linuxcontainers/monitor b/src/market_mad/remotes/linuxcontainers/monitor index 0d86f378a8..f6bcc0a2cc 100755 --- a/src/market_mad/remotes/linuxcontainers/monitor +++ b/src/market_mad/remotes/linuxcontainers/monitor @@ -145,7 +145,7 @@ class LinuxContainersMarket tmpl = "" - print_var(tmpl, "NAME", "#{distro[0...-1]}_#{version[0...-1]}") + print_var(tmpl, "NAME", "#{distro[0...-1]}_#{version[0...-1]} - LXD") print_var(tmpl, "SOURCE", "#{source}") print_var(tmpl, "IMPORT_ID", id) print_var(tmpl, "ORIGIN_ID", "-1") diff --git a/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb b/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb index 50a87f32f9..fbd95b7fa9 100644 --- a/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb +++ b/src/vmm_mad/remotes/lib/lxd/opennebula_vm.rb @@ -383,6 +383,7 @@ class OpenNebulaVM case signal when 'start' + # TODO: Allow to set vnc command on VM template command = @lxdrc[:vnc][:command] "#{data['PORT']} #{pass} lxc exec #{@vm_name} #{command}\n" when 'stop'