opennebula-cli 7.4.0 → 7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc90d78c95d12eaa1cc252ba7f1074bd66063bd2ede71145b398484e3982f97
-  data.tar.gz: 0b00dfb8643967411b0c332750e1d2bb5a8faaff63e9340afdb651f9f76cd721
+  metadata.gz: 1d12195ac5f81fb49dacff52feeb49f7084a56e7189ad1b4e16eb998e3c1e714
+  data.tar.gz: 321342df45b67dfd31d84a6bae0979c0c730231270f278865daaf54261e7e6eb
 SHA512:
-  metadata.gz: 689a42d243447806d3a0653bc0753c4ca3052d1bad68c2f3d5e771b561b2372dac5bbb0258911788db48d4ae9afa7474f4866aaeda36e068cabcb9a1588c2863
-  data.tar.gz: 00b1576fc2e54a5621f460b081e6fa15a2278642b4eeb1bc8ae8643826fb6433530340536bd48e79ca38f289ea563ddc85183aba9250f9bad09993f60ea25b7e
+  metadata.gz: 7453438e378077c78ea2a841caff821ff1865fdc65db7405e8aa2b2f60b45bf8641303a36b28e8f7d1a62e2fba7a2350c5c3770fad792e081ece03f0a305a15c
+  data.tar.gz: 9b82fc5f4180cf3088cfb88eb221dc7fbd7b6495e5b7ec145e1355c8c2868242db61c0d420210215290022eea1ef5b0e4eeea4151a889b6873a832f4a5c206b3

data/bin/onevm

@@ -1445,7 +1445,7 @@ CommandParser::CmdParser.new(ARGV) do
         INPUT     = ["TYPE", "BUS"]
         GRAPHICS  = ["TYPE", "LISTEN", "PASSWD", "KEYMAP", "COMMAND"]
         VIDEO     = ["TYPE", "IOMMU", "ATS", "VRAM", "RESOLUTION"]
-        RAW       = ["DATA", "DATA_VMX", "TYPE", "VALIDATE"]
+        RAW       = ["DATA", "TYPE", "VALIDATE"]
         CPU_MODEL = ["MODEL", "FEATURES"]
         BACKUP_CONFIG = ["FS_FREEZE", "KEEP_LAST", "BACKUP_VOLATILE", "MODE", "INCREMENT_MODE", "INTERACTIVE"]
         CONTEXT (any value, ETH* if CONTEXT_ALLOW_ETH_UPDATES set in oned.conf, **variable substitution will be made**)
@@ -1720,14 +1720,6 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    ssh_desc = <<-EOT.unindent
-        SSH into VM
-
-        Options example:
-
-        '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
-    EOT
-
     pci_attach_desc = <<-EOT.unindent
         Attaches a PCI to a VM.
 
@@ -1790,6 +1782,14 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    ssh_desc = <<-EOT.unindent
+        SSH into VM
+
+        Options example:
+
+        '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
+    EOT
+
     command :ssh,
             ssh_desc,
             :vmid,
@@ -1818,15 +1818,7 @@ CommandParser::CmdParser.new(ARGV) do
                 exit(-1)
             end
 
-            if options[:nic_id]
-                nic = vm.retrieve_xmlelements(
-                    "//TEMPLATE/NIC[NIC_ID=\"#{options[:nic_id]}\"]"
-                )[0]
-            else
-                nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
-            end
-
-            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0] if nic.nil?
+            nic = helper.ssh_nic(vm, options[:nic_id])
 
             if nic.nil?
                 STDERR.puts 'No NIC found'

data/bin/onezone

@@ -57,6 +57,12 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Also sync database'
     }
 
+    KEEP_HA = {
+        :name  => 'keep_ha',
+        :large => '--keep-ha',
+        :description => 'Keep local HA configuration parameters'
+    }
+
     before_proc do
         helper.set_client(options)
     end
@@ -247,7 +253,7 @@ CommandParser::CmdParser.new(ARGV) do
         This command must be executed under root
     EOT
 
-    command :serversync, sync_desc, :server, :options => [DATABASE] do
+    command :serversync, sync_desc, :server, :options => [DATABASE, KEEP_HA] do
         begin
             require 'augeas'
         rescue Gem::LoadError
@@ -264,7 +270,7 @@ CommandParser::CmdParser.new(ARGV) do
         end
 
         server = Replicator.new('/var/lib/one/.ssh/id_rsa', args[0])
-        server.process_files(options[:db])
+        server.process_files(options[:db], options[:keep_ha])
 
         0
     end

data/lib/one_helper/onevm_helper.rb

@@ -610,15 +610,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             options[:cmd].nil? ? cmd = '' : cmd = options[:cmd]
 
             # Get NIC to connect
-            if options[:nic_id]
-                nic = vm.retrieve_xmlelements(
-                    "//TEMPLATE/NIC[NIC_ID=\"#{options[:nic_id]}\"]"
-                )[0]
-            else
-                nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
-            end
-
-            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0] if nic.nil?
+            nic = ssh_nic(vm, options[:nic_id])
 
             if nic.nil?
                 STDERR.puts 'No NIC found'
@@ -657,6 +649,33 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
     end
 
+    def ssh_nic(vm, nic_id)
+        if nic_id
+            nic = vm.retrieve_xmlelements(
+                "//TEMPLATE/NIC[NIC_ID=\"#{nic_id}\"]"
+            )[0]
+            return nic unless nic.nil?
+
+            nic = vm.retrieve_xmlelements(
+                "//TEMPLATE/PCI[TYPE=\"NIC\"][NIC_ID=\"#{nic_id}\"]"
+            )[0]
+        else
+            nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[SSH="YES"]')[0]
+            return nic unless nic.nil?
+
+            nic = vm.retrieve_xmlelements(
+                '//TEMPLATE/PCI[TYPE="NIC"][SSH="YES"]'
+            )[0]
+        end
+
+        return nic unless nic.nil?
+
+        nic = vm.retrieve_xmlelements('//TEMPLATE/NIC[1]')[0]
+        return nic unless nic.nil?
+
+        vm.retrieve_xmlelements('//TEMPLATE/PCI[TYPE="NIC"][NIC_ID>-1]')[0]
+    end
+
     private
 
     def factory(id = nil)

data/lib/one_helper/onezone_helper.rb

@@ -28,7 +28,15 @@ class Replicator
 
     SSH_OPTIONS = '-o stricthostkeychecking=no -o passwordauthentication=no'
     ONE_AUTH    = '/var/lib/one/.one/one_auth'
-    FED_ATTRS   = ['MODE', 'ZONE_ID', 'SERVER_ID', 'MASTER_ONED']
+    FED_ATTRS   = ['MODE', 'ZONE_ID', 'SERVER_ID', 'MASTER_ONED',
+                   'MASTER_ONED_GRPC']
+    HA_ATTRS    = {
+        'RAFT' => ['LIMIT_PURGE', 'LOG_RETENTION', 'LOG_PURGE_TIMEOUT',
+                   'ELECTION_TIMEOUT_MS', 'BROADCAST_TIMEOUT_MS',
+                   'XMLRPC_TIMEOUT_MS'],
+        'RAFT_LEADER_HOOK'   => ['COMMAND', 'ARGUMENTS'],
+        'RAFT_FOLLOWER_HOOK' => ['COMMAND', 'ARGUMENTS']
+    }
 
     FILES = [
         { :name    => 'monitord.conf',
@@ -99,9 +107,10 @@ class Replicator
     # Process files and folders
     #
     # @param sync_database [Boolean] True to sync database
-    def process_files(sync_database)
+    # @param keep_ha       [Boolean] True to keep local HA configuration
+    def process_files(sync_database, keep_ha = false)
         # Files to be copied
-        copy_onedconf
+        copy_onedconf(keep_ha)
 
         FILES.each do |file|
             copy_and_check(file[:name], file[:service])
@@ -216,8 +225,10 @@ class Replicator
     # oned.conf file on distributed environments will always be different,
     # due to the federation section.
     # Replace oned.conf based on a remote server's version maintaining
-    # the old FEDERATION section
-    def copy_onedconf
+    # the old FEDERATION section and, optionally, the local HA parameters.
+    #
+    # @param keep_ha [Boolean] True to keep local HA configuration
+    def copy_onedconf(keep_ha)
         puts 'Checking oned.conf'
 
         # Create temporarhy files
@@ -266,6 +277,19 @@ class Replicator
             fed_attrs << l_aug.get("FEDERATION/#{attr}")
         end
 
+        ha_attrs = {}
+
+        if keep_ha
+            HA_ATTRS.each do |section, attrs|
+                ha_attrs[section] = attrs.map do |attr|
+                    l_aug.get("#{section}/#{attr}")
+                end
+
+                l_aug.rm(section)
+                r_aug.rm(section)
+            end
+        end
+
         # Remove federation section
         l_aug.rm('FEDERATION')
         r_aug.rm('FEDERATION')
@@ -286,6 +310,12 @@ class Replicator
             r_aug.set("FEDERATION/#{name}", value)
         end
 
+        ha_attrs.each do |section, values|
+            HA_ATTRS[section].zip(values) do |name, value|
+                r_aug.set("#{section}/#{name}", value) unless value.nil?
+            end
+        end
+
         r_aug.save
 
         FileUtils.cp(r_oned.path, '/etc/one/oned.conf')

data/lib/one_helper.rb

@@ -1872,7 +1872,7 @@ Bash symbols must be escaped on STDIN passing'
             res=parse_user_object(obj)
             return [-1, "#{section.capitalize} \"#{obj}\" malformed"] unless res
 
-            user, object=*res
+            user, object = res
 
             template<<"#{section.upcase}=[\n"
             if section.upcase == 'NIC' && ['auto', 'dummy'].include?(object.downcase)

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -285,6 +285,7 @@
           </xs:complexType>
         </xs:element>
 
+        <xs:element name="REUSE_ADDRESS" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="RPC_LOG" type="xs:string" minOccurs="0" maxOccurs="1"/>
 
         <xs:element name="SCHED_MAD" minOccurs="0" maxOccurs="1">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-07-27 00:00:00.000000000 Z
+date: 2026-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.4.0
+        version: 7.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.4.0
+        version: 7.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement