From 9f1f15c3de55c3f73e6f5d8a6ef5ac7872cf6f70 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 14 Feb 2025 09:18:00 +0900
Subject: [PATCH] Drop explicit install of ruby-augeas

It is installed as part of dependencies of puppet in integration tests.

Also install augeas-dev(el) so that we can install ruby-augeas from
gem, which is required in litmus jobs.

Change-Id: Ib8c63f3bd66052618ab7865766c17a03ac883a2f
---
 manifests/repos.pp                 | 9 ---------
 playbooks/prepare-node-common.yaml | 3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 2dce098ec..2c71ec89d 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -70,13 +70,4 @@ class openstack_integration::repos {
       fail("Unsupported osfamily (${facts['os']['family']})")
     }
   }
-
-  # NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.
-  package { 'ruby-augeas':
-    ensure => 'present',
-  }
-
-  if $facts['os']['family'] == 'RedHat' {
-    Yumrepo<||> -> Package<| title == 'ruby-augeas' |>
-  }
 }
diff --git a/playbooks/prepare-node-common.yaml b/playbooks/prepare-node-common.yaml
index 7f39d55dd..e8838a95f 100644
--- a/playbooks/prepare-node-common.yaml
+++ b/playbooks/prepare-node-common.yaml
@@ -41,6 +41,7 @@
           - libxml2-devel
           - libxslt-devel
           - ruby-devel
+          - augeas-devel
           - zlib-devel
           - langpacks-en
           - glibc-langpack-en
@@ -72,6 +73,8 @@
         - libxml2-dev
         - libxslt-dev
         - ruby-dev
+        - libaugeas-dev
+        - pkg-config
         - zlib1g-dev
         - python3-pip