foreman_gridscale 1.0.0 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d75f5b0099e48772d8f7f8bd579b5f848a7b675f
4
- data.tar.gz: a47fb0300bd95935f28491d7b71c930d45b5e876
3
+ metadata.gz: 48a36cfbcfeb2d14c63616beaa15bf59254d1d39
4
+ data.tar.gz: 95893d8031c5e48708633bdd0341f02027f41fab
5
5
  SHA512:
6
- metadata.gz: 65e8d889cf94d78649d524e67906a7707a1c6850669fd0e95aa4c782210525938388f34cd83d9494402720f9d234d3a9844a9ddbfcab603faf098af9986496a2
7
- data.tar.gz: ea85ef605c72b975e0e0bec552a6d83fc30d15ac7d5c5db79276f5c444855bbc74ace34362159fdb20da8b043f78b6ef3bfa9f91923e521e5a2af44d91c0706e
6
+ metadata.gz: 0c9658f128848be3ba855ae279c113101fc3dee459c7608ac9e0d30f3075c0993d5d38813e118340d0239ce213c336a15a87d3d36dfcaa9f6c33260ea974ee32
7
+ data.tar.gz: d6abf31b951a52e6a0392c7685bfdf8bdac3a278a08463495f1fc5113085e40e9066b1af4ec68fbaf28a51c359eac62156b07e0ac5dd5e879c2a2d19637e5c2d
@@ -9,7 +9,7 @@ module GridscaleImagesHelper
9
9
  def select_ipv4(f, compute_resource)
10
10
  addresses = Array.new
11
11
  compute_resource.ips.each do |ip|
12
- if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==4
12
+ if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==4 and ip.failover = false
13
13
  addresses << ip
14
14
  end
15
15
  end
@@ -29,7 +29,7 @@ module GridscaleImagesHelper
29
29
  def select_ipv6(f, compute_resource)
30
30
  addresses = Array.new
31
31
  compute_resource.ips.each do |ip|
32
- if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==6
32
+ if ip.relations['servers'].empty? and ip.relations['loadbalancers'].empty? and ip.family ==6 and ip.failover = false
33
33
  addresses << ip
34
34
  end
35
35
  end
@@ -119,6 +119,22 @@ module GridscaleImagesHelper
119
119
 
120
120
  end
121
121
 
122
+ def select_isoimage(f, compute_resource)
123
+ template_list = Array.new
124
+ compute_resource.isoimages.each do |isoimage|
125
+ template_list << isoimage
126
+ end
127
+
128
+ select_f(f,
129
+ :isoimage_uuid,
130
+ template_list,
131
+ :object_uuid,
132
+ :name,
133
+ { :include_blank => true },
134
+ { :label => 'Iso-image'})
135
+
136
+ end
137
+
122
138
  def gridscale_image_field(f)
123
139
  images = @compute_resource.available_templates
124
140
  images.each { |image| image.name = image.object_uuid if image.name.nil? }
@@ -10,6 +10,9 @@ module ForemanGridscale
10
10
  validates :api_token, :user_uuid, :presence => true
11
11
  before_create :test_connection
12
12
 
13
+ def supports_update?
14
+ true
15
+ end
13
16
 
14
17
  def api_token
15
18
  attrs[:api_token]
@@ -126,6 +129,10 @@ module ForemanGridscale
126
129
  client.sshkeys
127
130
  end
128
131
 
132
+ def isoimages
133
+ client.isoimages
134
+ end
135
+
129
136
  def available_templates
130
137
  images = []
131
138
  collection = client.templates
@@ -1,6 +1,10 @@
1
1
  <%= number_f f, :cores, :label => _("Cores") , :required =>true%>
2
2
  <%= number_f f, :memory, :label => _("Memory in GB"), :required =>true%>
3
3
  <%= number_f f, :storage, :label => _("Storage in GB") %>
4
+
5
+ <div id='isoimage_selection'>
6
+ <%=select_isoimage(f, compute_resource) %>
7
+ </div>
4
8
  <div id='template_selection'>
5
9
  <%=select_template(f, compute_resource) %>
6
10
  </div>
@@ -13,7 +13,7 @@
13
13
 
14
14
  <tr>
15
15
  <td>Console</td>
16
- <td><a target="_blank" href="https://my.gridscale.io/js/UX/Helper/VNC/terminalModalStandalone.html?uuid=<%= @vm.object_uuid %>&path=api.gridscale.io">Open</a></td>
16
+ <td><a target="_blank" href="https://my.gridscale.io/Easy/js/UX/Helper/VNC/terminalModalStandalone.html?uuid=<%= @vm.object_uuid %>&name=<%= @vm.name %>&path=api.gridscale.io">Open</a></td>
17
17
  </tr>
18
18
  </table>
19
19
  </div>
@@ -1,3 +1,3 @@
1
1
  module ForemanGridscale
2
- VERSION = '1.0.0'.freeze
2
+ VERSION = '1.0.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_gridscale
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Aldemuro Haris
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-12-31 00:00:00.000000000 Z
12
+ date: 2019-02-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rubocop