From 299832988f279078502cadd7d6b2e00491db16a6 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 27 Oct 2015 23:24:10 -0700
Subject: [PATCH] Revert "Unlimit the number of open files on etherpad"

This reverts commit e737a1f5332629ed1f821f0c9c4dc78e6486f7f0.

This didn't actually apply because upstart avoids limits.conf. Remove it
as we fixed this in upstart job directly.

Change-Id: I835c39af1643d42e30d95f0cc9586c4e04001628
---
 modules/openstack_project/manifests/etherpad.pp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp
index 20026b7ad2..66832dd4c4 100644
--- a/modules/openstack_project/manifests/etherpad.pp
+++ b/modules/openstack_project/manifests/etherpad.pp
@@ -49,14 +49,6 @@ class openstack_project::etherpad (
     backup_user   => 'bup-etherpad',
     backup_server => 'ci-backup-rs-ord.openstack.org',
   }
-
-  include ulimit
-  ulimit::conf { 'unlimit_etherpad_files':
-    limit_domain => 'eplite',
-    limit_type   => 'hard',
-    limit_item   => 'nofile',
-    limit_value  => '10000'
-  }
 }
 
 # vim:sw=2:ts=2:expandtab:textwidth=79