foreman_xen 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0c3b2a37c986005efe387f6931f768f5359ab6e9
4
- data.tar.gz: bb8daba521e44ab73a7e84585202abee259f823b
3
+ metadata.gz: 25b0e526633d3dd22bc525a72bc5a5dc8f07e44d
4
+ data.tar.gz: 71dd93045915fc1def2b5d32a9b0507a6d44515f
5
5
  SHA512:
6
- metadata.gz: f27f16653e04ceb293c3ac3f6fef2a3d727f27297a51fd89c3cf9a11424533e4cab75a4997baef790dd325f7518dae462a088f45063293b7abe6c74585b35fc9
7
- data.tar.gz: fb4bc0be2fca1262513e4ad9ddd1f70197e709b9c58fc220a986b612372d0ce037a379befc6b95e10bc2058889fe0ff816989101263f955c0d1a3e9f7f167404
6
+ metadata.gz: 99f352b74c6bd40a8b61825175b40bded58cfb7541aa5252c1b8c2b2b836073234ca0baa2c72ce422180a9bd0c948860029287d7abafb59f8e08ee23eecf5e43
7
+ data.tar.gz: 0f7d00cbb23064adbad33b3642fde78251fe50305bb2dd96f31e01445856fd3a6cb645c39f92dfe199c16cd2aa67ddccab244105e64e76f70cc83d4690ba36c6
data/README.md CHANGED
@@ -14,7 +14,7 @@ The gem name is "foreman_xen".
14
14
 
15
15
  | Foreman Version | Plugin Version |
16
16
  | ---------------:| --------------:|
17
- | >= 1.5 | 0.0.2 |
17
+ | >= 1.5 | 0.0.3 |
18
18
 
19
19
  ## Latest code
20
20
 
@@ -62,7 +62,8 @@ module ForemanXen
62
62
  end
63
63
 
64
64
  def storage_pools
65
- client.storage_repositories rescue []
65
+ storages = client.storage_repositories.select { |sr| sr.type!= 'udev' && sr.type!= 'iso'} rescue []
66
+ storages.sort { |a, b| a.name <=> b.name }
66
67
  end
67
68
 
68
69
  def interfaces
@@ -70,7 +71,8 @@ module ForemanXen
70
71
  end
71
72
 
72
73
  def networks
73
- client.networks rescue []
74
+ networks = client.networks rescue []
75
+ networks.sort { |a, b| a.name <=> b.name }
74
76
  end
75
77
 
76
78
  def templates
@@ -214,11 +216,10 @@ module ForemanXen
214
216
  vm
215
217
  end
216
218
 
217
- def console(uuid)
219
+ def console uuid
218
220
  vm = find_vm_by_uuid(uuid)
219
221
  raise 'VM is not running!' unless vm.ready?
220
222
 
221
-
222
223
  console = vm.service.consoles.find { |c| c.__vm == vm.reference && c.protocol == 'rfb' }
223
224
  raise "No console fore vm #{vm.name}" if console == nil
224
225
 
@@ -282,6 +283,7 @@ module ForemanXen
282
283
  end
283
284
  end
284
285
  out_hash
286
+ # @key = key
285
287
  end
286
288
  end
287
289
  end
@@ -11,8 +11,8 @@
11
11
  <div class="fields">
12
12
  <%= text_f f, :name, :disabled => !new if controller_name != 'hosts' %>
13
13
  <%= selectable_f f, :vcpus_max, 1..compute_resource.max_cpu_count, {}, :class => 'input-mini', :disabled => !new, :label => 'vCPUs' %>
14
- <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {}, :class => 'span2', :disabled => !new %>
15
- <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {}, :class => 'span2', :disabled => !new %>
14
+ <%= selectable_f f, :memory_min, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !new, :label => 'Memory Min' %>
15
+ <%= selectable_f f, :memory_max, memory_options(compute_resource.max_memory), {}, :class => 'form-control span2', :disabled => !new, :label => 'Memory Max' %>
16
16
  </div>
17
17
  </fieldset>
18
18
  </div>
@@ -51,8 +51,20 @@
51
51
  <% end -%>
52
52
  </div>
53
53
 
54
- <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
55
- <%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _('Power ON this machine') } if new %>
54
+ <div class="children_fields" id="xenserver-vm-start" style="<%= hide_raw %>">
55
+ <%= field_set_tag 'VM Startup Options', :id => 'vm_starup_options', :title => _('Power ON this machine') do -%>
56
+ <div class="form-group">
57
+ <label class="col-md-2 control-label" for="xenserver-vm-start-params">Power ON this VM</label>
58
+ <div class="col-md-4">
59
+ <div class="controls">
60
+ <% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
61
+ <%= checkbox_f f, :start, { :checked => (checked == '1')} if new %>
62
+ </div>
63
+ </div>
64
+ </div>
65
+ <% end -%>
66
+ </div>
67
+
56
68
 
57
69
 
58
70
  <script type="text/javascript">
@@ -29,58 +29,55 @@
29
29
 
30
30
  <div class="children_fields">
31
31
 
32
- <div class="fields"/>
33
-
34
- <div class="form-group">
35
- <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
36
- <div class="col-md-4">
37
- <div class="controls">
38
- <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= ip %>">
39
- </div>
40
- </div>
41
- </div>
42
-
43
- <div class="form-group">
44
- <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
45
- <div class="col-md-4">
46
- <div class="controls">
47
- <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= gateway %>">
48
- </div>
49
- </div>
50
- </div>
51
-
52
- <div class="form-group">
53
- <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
54
- <div class="col-md-4">
55
- <div class="controls">
56
- <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= netmask %>">
57
- </div>
58
- </div>
59
- </div>
60
-
61
- <div class="form-group">
62
- <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
63
- <div class="col-md-4">
64
- <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= nameserver1 %>">
65
- </div>
66
- </div>
67
- </div>
68
-
69
- <div class="form-group">
70
- <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
71
- <div class="col-md-4">
72
- <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= nameserver2 %>">
73
- </div>
74
- </div>
75
- </div>
76
-
77
- <div class="form-group">
78
- <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
79
- <div class="col-md-4">
80
- <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= environment %>">
81
- </div>
82
- </div>
83
-
32
+ <div class="fields">
33
+
34
+ <div class="form-group">
35
+ <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-ip">vm-data/ifs/0/ip</label>
36
+ <div class="col-md-4">
37
+ <div class="controls">
38
+ <input <%= disabled %> id="xenstore-vm-data-ifs-0-ip" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][ip]" class="form-control input-mini" value="<%= ip %>">
39
+ </div>
40
+ </div>
41
+ </div>
42
+
43
+ <div class="form-group">
44
+ <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-gateway">vm-data/ifs/0/gateway</label>
45
+ <div class="col-md-4">
46
+ <div class="controls">
47
+ <input <%= disabled %> id="xenstore-vm-data-ifs-0-gateway" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][gateway]" class="form-control input-mini" value="<%= gateway %>">
48
+ </div>
49
+ </div>
50
+ </div>
51
+
52
+ <div class="form-group">
53
+ <label class="col-md-2 control-label" for="xenstore-vm-data-ifs-0-netmask">vm-data/ifs/0/netmask</label>
54
+ <div class="col-md-4">
55
+ <div class="controls">
56
+ <input <%= disabled %> id="xenstore-vm-data-ifs-0-netmask" type="text" name="host[compute_attributes][xenstore][vm-data][ifs][0][netmask]" class="form-control input-mini" value="<%= netmask %>">
57
+ </div>
58
+ </div>
59
+ </div>
60
+
61
+ <div class="form-group">
62
+ <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver1">vm-data/nameserver1</label>
63
+ <div class="col-md-4">
64
+ <input <%= disabled %> id="xenstore-vm-data-nameserver1" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver1]" class="form-control input-mini" value="<%= nameserver1 %>">
65
+ </div>
66
+ </div>
67
+
68
+ <div class="form-group">
69
+ <label class="col-md-2 control-label" for="xenstore-vm-data-nameserver2">vm-data/nameserver2</label>
70
+ <div class="col-md-4">
71
+ <input <%= disabled %> id="xenstore-vm-data-nameserver2" type="text" name="host[compute_attributes][xenstore][vm-data][nameserver2]" class="form-control input-mini" value="<%= nameserver2 %>">
72
+ </div>
73
+ </div>
74
+
75
+ <div class="form-group">
76
+ <label class="col-md-2 control-label" for="xenstore-vm-data-environment">vm-data/environment</label>
77
+ <div class="col-md-4">
78
+ <input <%= disabled %> id="xenstore-vm-data-environment" type="text" name="host[compute_attributes][xenstore][vm-data][environment]" class="form-control input-mini" value="<%= environment %>">
79
+ </div>
80
+ </div>
84
81
  </div>
85
82
  </div>
86
83
 
@@ -1,3 +1,3 @@
1
1
  module ForemanXen
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_xen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Nemirovsky, Michał Piotrowski, Avi Israeli
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-16 00:00:00.000000000 Z
11
+ date: 2014-07-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake