Merge branch 'master' into improvement/#15878_rb_selinux

redBorder · Dec 1, 2023 · bfa0c3d · bfa0c3d
2 parents 629f246 + 217c2e5
commit bfa0c3d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packaging/rpm/cookbook-rb-manager.spec b/packaging/rpm/cookbook-rb-manager.spec
@@ -45,6 +45,8 @@ esac
 %doc
 
 %changelog
+* Wed Sep 29 2023 Miguel Álvarez <[email protected]> - 1.5.18-1
+- Add cgroup
 * Thu Sep 28 2023 Miguel Negrón <[email protected]> - 1.5.17-1
 - Add rbaioutliers
 * Mon Jun 26 2023 Luis J. Blanco <[email protected]> - 1.5.15-1

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures redborder manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.5.17'
+version          '1.5.18'
 
 depends 'chef-server'
 depends 'zookeeper'
@@ -38,4 +38,5 @@
 depends 'cron'
 #depends 'ohai'
 depends 'rb-selinux'
-depends 'rbaioutliers'
+#depends 'rbaioutliers'
+depends 'rbcgroup'
diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -319,6 +319,10 @@
 #  action (node["redborder"]["services"]["redborder-cep"] ? [:add, :register] : [:remove, :deregister])
 #end
 
+
+rbcgroup_config "Configure cgroups" do
+  action :add 
+end
 
 # Determine external
 external_services = Chef::DataBagItem.load("rBglobal", "external_services")