From 82f87e987ff228d2c439b87f404696176415a276 Mon Sep 17 00:00:00 2001
From: Jan Orel <jorel@opennebula.io>
Date: Tue, 3 Sep 2024 14:08:07 +0200
Subject: [PATCH] B #6587: Switch to opennebula-augeas gem (#3079)

Switch to OpenNebula fork of the discontinued augeas gem.
---
 src/cli/onezone                      | 6 +-----
 src/mad/ruby/scripts_common.rb       | 3 ---
 src/onecfg/lib/config/type/augeas.rb | 1 -
 src/onedb/onedb.rb                   | 6 +-----
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/cli/onezone b/src/cli/onezone
index 95f30126e4..db47632003 100755
--- a/src/cli/onezone
+++ b/src/cli/onezone
@@ -246,15 +246,11 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :serversync, sync_desc, :server, :options => [DATABASE] do
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
-            gem 'augeas', '~> 0.6'
             require 'augeas'
         rescue Gem::LoadError
             STDERR.puts(
                 'Augeas gem is not installed, run `gem install ' \
-                'augeas -v \'0.6\'` to install it'
+                'opennebula-augeas` to install it'
             )
             exit(-1)
         end
diff --git a/src/mad/ruby/scripts_common.rb b/src/mad/ruby/scripts_common.rb
index f32a489527..19d6b23111 100644
--- a/src/mad/ruby/scripts_common.rb
+++ b/src/mad/ruby/scripts_common.rb
@@ -104,9 +104,6 @@ module OpenNebula
         file_name = 'monitord.conf'
 
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
             require 'augeas'
 
             aug = Augeas.create(:no_modl_autoload => true,
diff --git a/src/onecfg/lib/config/type/augeas.rb b/src/onecfg/lib/config/type/augeas.rb
index 2580fcbb35..fe9c261312 100644
--- a/src/onecfg/lib/config/type/augeas.rb
+++ b/src/onecfg/lib/config/type/augeas.rb
@@ -14,7 +14,6 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-gem 'augeas', '~> 0.6'
 require 'augeas'
 
 # rubocop:disable Style/ClassAndModuleChildren
diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb
index 42dfc3d861..f00a70a1b7 100644
--- a/src/onedb/onedb.rb
+++ b/src/onedb/onedb.rb
@@ -127,15 +127,11 @@ class OneDB
 
     def read_credentials(ops)
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
-            gem 'augeas', '~> 0.6'
             require 'augeas'
         rescue Gem::LoadError
             STDERR.puts(
                 'Augeas gem is not installed, run `gem install ' \
-                'augeas -v \'0.6\'` to install it'
+                'opennebula-augeas` to install it'
             )
             exit(-1)
         end