opennebula 5.4.5 → 5.4.6

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: 6edb16729085dc273853f6da757953730008012e
4
- data.tar.gz: 4b33475843d46faf29c304a755614b8c89460d07
3
+ metadata.gz: 4ebf0cd09e8809b697d40ebd505a144832774728
4
+ data.tar.gz: 33865b185c411eb20b55979a7fdfa9962ce2b0d8
5
5
  SHA512:
6
- metadata.gz: c2e93c7d1e1737e67fe1cf99f4e7da5d3592090bff9693ad50e736226084cf2f625442206869d04667533331a165e322f50cfc24f11f60483fa3bb6e26736656
7
- data.tar.gz: f1d1892bcc796ddf6e4d2276aa701389ed10f3e639791d54a03329ce553ecf0a3a95b2b5c66a0b0ee9035d1f4b78d8b04c7918d92cc1a1642a0df8d1edee8061
6
+ metadata.gz: 0c7018e8700721a5f8d674fb1dbfc7543d581c4d928f0ca0f5f8a1d3a96794cdad931152be7f449770dedf31974095e68fd2c1c0b945f00e68d1f1caf3e1e3b7
7
+ data.tar.gz: 44ad7950f56107558ac1cd5ccfff15d02406c3f3390d4378fd23af4e67ee3b9228c72d5c2cd0423ce0315bf50b0c13b5fae1b352f1b6f956d07fcd12ef0aeadb
@@ -50,7 +50,7 @@ end
50
50
  module CloudClient
51
51
 
52
52
  # OpenNebula version
53
- VERSION = '5.4.5'
53
+ VERSION = '5.4.6'
54
54
 
55
55
  # #########################################################################
56
56
  # Default location for the authentication file
@@ -69,5 +69,5 @@ require 'opennebula/vm_group_pool'
69
69
  module OpenNebula
70
70
 
71
71
  # OpenNebula version
72
- VERSION = '5.4.5'
72
+ VERSION = '5.4.6'
73
73
  end
@@ -743,7 +743,9 @@ module OpenNebula
743
743
  #
744
744
  # @return [Integer, OpenNebula::Error] the new Template ID in case of
745
745
  # success, error otherwise
746
- REMOVE_VNET_ATTRS = %w{AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID NETWORK_ID VN_MAD SECURITY_GROUPS}
746
+ REMOVE_VNET_ATTRS = %w{AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID
747
+ NETWORK_ID VN_MAD SECURITY_GROUPS VLAN_ID}
748
+
747
749
  def save_as_template(name,description, persistent=nil)
748
750
  img_ids = []
749
751
  new_tid = nil
@@ -848,12 +850,11 @@ module OpenNebula
848
850
  rc = Error.new('The NIC_ID is missing from the VM template')
849
851
  raise
850
852
  end
851
- REMOVE_VNET_ATTRS.each do |attr|
853
+ REMOVE_VNET_ATTRS.each do |attr|
852
854
  nic.delete_element(attr)
853
855
  end
854
-
855
- replace << self.template_like_str(
856
- "TEMPLATE", true, "NIC[#{nic}]") << "\n"
856
+
857
+ replace << "NIC = [ " << nic.template_like_str(".").tr("\n", ",\n") << " ] \n"
857
858
  end
858
859
 
859
860
  # Required by the Sunstone Cloud View
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.4.5
4
+ version: 5.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-11 00:00:00.000000000 Z
11
+ date: 2018-01-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri