manageiq-appliance_console 9.1.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d0ec5457c80696cb57975c7b90ed74b04b6b8f9732686776524c9a19a63d6b9
-  data.tar.gz: 934f6a498b9d3916be9618d7a22ce98cc2f71800a099edbc12ac8a400e6a214a
+  metadata.gz: 92c044bd2f3d92f8d58e493c00f95305372fd4954c7e66f9b352093311450976
+  data.tar.gz: 8b61325b1fe64b83f7160225c7aeae2b91ac415a48089c4bb387120d76446ee3
 SHA512:
-  metadata.gz: 4a47aedb1dfe010537e0e015ad67b65e3d5a2402375d3cd667a007d52396bb7a24b18ad652f5da0f91f895740331faac6fbf0c3859fc64e419957be81419651f
-  data.tar.gz: 7e8c13d6558303e7028917ca58d3e85635088eaca14de87222f5fe9e38a9019d599203d9b94a3c8ed418038e47cc52b47c694c3d12b3c9b5120d51ec63a95be7
+  metadata.gz: c063b69eee1a7b04a4e3a08c96a78679969e4903e670fb3018e4f6ce1325f76b1168f20064530b0781b8badff3376740413067cc9cffa8c37a69c3c09dc4b697
+  data.tar.gz: 4e390849ca9978b98501214c0f80de65e854f82d1fb3ae1c449da07cb6d8db5fe6df26ea0c2b518708b2db139bef0eb9fa99271f78d865437dc377627214bb76

data/.github/workflows/ci.yaml

@@ -42,6 +42,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: "${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.0' && matrix.rails-version == '6.1' }}"
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' && matrix.rails-version == '7.0' }}
       continue-on-error: true
       uses: paambaati/codeclimate-action@v8

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [9.1.1] - 2024-08-13
+### Changed
+- Don't depend on eth0 for displaying network information [[#263](https://github.com/ManageIQ/manageiq-appliance_console/pull/263)]
+
 ## [9.1.0] - 2024-07-24
 ### Added
 - Add a common method for asking for a password [[#251](https://github.com/ManageIQ/manageiq-appliance_console/pull/251)]
@@ -285,7 +289,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.0.0] - 2017-10-19
 
-[Unreleased]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.1.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.1.1...HEAD
+[9.1.1]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.1.0...v9.1.1
 [9.1.0]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.0.3...v9.1.0
 [9.0.3]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.0.2...v9.0.3
 [9.0.2]: https://github.com/ManageIQ/manageiq-appliance_console/compare/v9.0.1...v9.0.2

data/bin/appliance_console

@@ -72,13 +72,13 @@ RE_RESTART  = "Restart".freeze
 RE_DELLOGS  = "Restart and Clean Logs".freeze
 RE_OPTIONS  = [RE_RESTART, RE_DELLOGS, ManageIQ::ApplianceConsole::CANCEL].freeze
 
-NETWORK_INTERFACE = "eth0".freeze
 CLOUD_INIT_NETWORK_CONFIG_FILE = "/etc/cloud/cloud.cfg.d/99_miq_disable_network_config.cfg".freeze
 CLOUD_INIT_DISABLE_NETWORK_CONFIG = "network: {config: disabled}\n".freeze
 
 module ManageIQ
 module ApplianceConsole
-  eth0 = LinuxAdmin::NetworkInterface.new(NETWORK_INTERFACE)
+  # Get a list of network interfaces
+  nics = LinuxAdmin::NetworkInterface.list.reject(&:loopback?)
   # Because it takes a few seconds, get the region once in the outside loop
   region = ManageIQ::ApplianceConsole::DatabaseConfiguration.region
 
@@ -88,15 +88,8 @@ module ApplianceConsole
 
   loop do
     begin
-      dns = LinuxAdmin::Dns.new
-      eth0.reload
-      eth0.parse_conf if eth0.respond_to?(:parse_conf)
-
+      dns              = LinuxAdmin::Dns.new
       host             = LinuxAdmin::Hosts.new.hostname
-      ip               = eth0.address
-      mac              = eth0.mac_address
-      mask             = eth0.netmask
-      gw               = eth0.gateway
       dns1, dns2       = dns.nameservers
       order            = dns.search_order.join(' ')
       timezone         = LinuxAdmin::TimeDate.system_timezone
@@ -113,16 +106,25 @@ module ApplianceConsole
         "not configured"
       end
 
-      summary_attributes = [
-        summary_entry("Hostname", host),
-        summary_entry("IPv4 Address", "#{ip}/#{mask}"),
-        summary_entry("IPv4 Gateway", gw),
-        summary_entry("IPv6 Address", eth0.address6 ? "#{eth0.address6}/#{eth0.prefix6}" : ''),
-        summary_entry("IPV6 Gateway", eth0.gateway6),
+      summary_attributes = [summary_entry("Hostname", host)]
+
+      nics.each(&:reload)
+      nics.each do |nic|
+        next if nic.address.nil? && nic.address6.nil?
+
+        summary_attributes += [
+          summary_entry("#{nic.interface} IPv4 Address", "#{nic.address}/#{nic.prefix}"),
+          summary_entry("#{nic.interface} IPv4 Gateway", nic.gateway),
+          summary_entry("#{nic.interface} IPv6 Address", nic.address6 ? "#{nic.address6}/#{nic.prefix6}" : ""),
+          summary_entry("#{nic.interface} IPv6 Gateway", nic.gateway6),
+          summary_entry("#{nic.interface} MAC Address", nic.mac_address)
+        ]
+      end
+
+      summary_attributes += [
         summary_entry("Primary DNS", dns1),
         summary_entry("Secondary DNS", dns2),
         summary_entry("Search Order", order),
-        summary_entry("MAC Address", mac),
         summary_entry("Timezone", timezone),
         summary_entry("Local Database Server", PostgresAdmin.local_server_status),
         summary_entry("#{I18n.t("product.name")} Server", evm_status),

data/lib/manageiq/appliance_console/database_replication.rb

@@ -25,6 +25,10 @@ module ApplianceConsole
     attr_accessor :node_number, :database_name, :database_user,
                   :database_password, :primary_host
 
+    def network_interfaces
+      @network_interfaces ||= LinuxAdmin::NetworkInterface.list.reject(&:loopback?)
+    end
+
     def ask_for_unique_cluster_node_number
       self.node_number = ask_for_integer("number uniquely identifying this node in the replication cluster")
     end

data/lib/manageiq/appliance_console/database_replication_primary.rb

@@ -10,7 +10,7 @@ module ApplianceConsole
       self.database_name     = "vmdb_production"
       self.database_user     = "root"
       self.database_password = nil
-      self.primary_host      = LinuxAdmin::NetworkInterface.new(NETWORK_INTERFACE).address
+      self.primary_host      = network_interfaces.first&.address
     end
 
     def ask_questions

data/lib/manageiq/appliance_console/database_replication_standby.rb

@@ -17,7 +17,7 @@ module ApplianceConsole
       self.database_user     = "root"
       self.database_password = nil
       self.primary_host      = nil
-      self.standby_host      = LinuxAdmin::NetworkInterface.new(NETWORK_INTERFACE).address
+      self.standby_host      = network_interfaces.first&.address
       self.resync_data       = false
     end
 

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '9.1.0'.freeze
+    VERSION = '9.1.1'.freeze
   end
 end

data/manageiq-appliance_console.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "ed25519",                 ">= 1.2", "< 2.0"
   spec.add_runtime_dependency "highline",                "~> 2.1"
   spec.add_runtime_dependency "i18n",                    ">= 0.8"
-  spec.add_runtime_dependency "linux_admin",             "~> 3.0"
+  spec.add_runtime_dependency "linux_admin",             "~> 4.0"
   spec.add_runtime_dependency "manageiq-password",       "< 2"
   spec.add_runtime_dependency "net-scp",                 "~> 4.0"
   spec.add_runtime_dependency "net-ssh",                 "~> 7.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.1.1
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: manageiq-password
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: ManageIQ Appliance Console