From 1002258b5d318cce34ea61c9331487df437e876c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 21 Nov 2022 10:27:30 +0900
Subject: [PATCH] Install ruby-augeas in Debian

... because the package is available in recent stable releases[1].
This allows us to make the logic to install the package simpler.

[1]
https://packages.debian.org/stretch/ruby-augeas
https://packages.debian.org/buster/ruby-augeas
https://packages.debian.org/bullseye/ruby-augeas

Change-Id: If9c4bdbb3d8c447303adb6ddee420c12ecda4133
---
 manifests/repos.pp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 70545cfe8..e29b2639c 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -130,6 +130,11 @@ class openstack_integration::repos {
     }
   }
 
+  # NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.
+  package { 'ruby-augeas':
+    ensure => 'present',
+  }
+
   if $::osfamily == 'RedHat' {
     # NOTE(tobias-urdin): Install libibverbs to fix an issue where OVS outputs errors
     # that causes the puppet-openvswitch module to fail parsing the output.
@@ -141,17 +146,6 @@ class openstack_integration::repos {
       ensure => 'present',
     }
 
-    # NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.
-    package { 'ruby-augeas':
-      ensure => 'present',
-    }
     Yumrepo<||> -> Package<| title == 'ruby-augeas' |>
   }
-
-  if $::operatingsystem == 'Ubuntu' {
-    # NOTE(tobias-urdin): Needed where augeas is used, like puppet-ovn.
-    package { 'ruby-augeas':
-      ensure => 'present',
-    }
-  }
 }