Merge branch 'foreman/master' into template_fixes

theforeman · Nov 20, 2014 · a45754c · a45754c
2 parents f3b1931 + f8ad0df
commit a45754c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -10,6 +10,11 @@ Please see the Foreman manual for appropriate instructions:
 
 The gem name is "foreman_xen".
 
+To make VNC client work properly, Foreman frontend should be configured without forcing SSL:
+
+/usr/share/foreman/config/settings.yaml
+:require_ssl: false
+
 ## Compatibility
 
 | Foreman Version | Plugin Version |

diff --git a/app/models/foreman_xen/xenserver.rb b/app/models/foreman_xen/xenserver.rb
@@ -213,7 +213,7 @@ def create_vm_from_builtin(args)
       vm = client.servers.new :name               => args[:name],
                               :affinity           => host,
                               :pv_bootloader      => '',
-                              :hvm_boot_params    => { :order => 'dn' },
+                              :hvm_boot_params    => { :order => 'dnc' },
                               :other_config       => other_config,
                               :memory_static_max  => mem_max,
                               :memory_static_min  => mem_min,

diff --git a/app/views/api/v1/compute_resources/xenserver.json.rabl b/app/views/api/v1/compute_resources/xenserver.json.rabl
@@ -0,0 +1 @@
+attributes :user
diff --git a/app/views/api/v2/compute_resources/xenserver.json.rabl b/app/views/api/v2/compute_resources/xenserver.json.rabl
@@ -0,0 +1 @@
+attributes :user
diff --git a/foreman_xen.gemspec b/foreman_xen.gemspec
@@ -1,3 +1,4 @@
+# encoding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version: