Remove security limits and apt.conf.d setting from diskimages

Limits was recently added for NPM jobs and should be moved into JJB.
Our apt.conf.d changes can be removed, we now have locally APT mirrors
in each region, this should remove the need for these 2 files.

As for the reason for the removal of our 2 apt.conf.d files, I believe
we no longer need to skip translations or apt retry values as each
cloud region has local AFS repos for APT.

However, I plan to keep an eye on this and we can always add these
files back into DIB elements if it becomes an issue.

Change-Id: Iafec2c547f65386805822ff2b0ba9a418c962a8e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

modules/openstack_project/manifests/server.pp

@@ -50,6 +50,30 @@ class openstack_project::server (
   }
 
   if $::osfamily == 'Debian' {
+    file { '/etc/security/limits.d/60-nofile-limit.conf':
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      source  => 'puppet:///modules/openstack_project/debian_limits.conf',
+      replace => true,
+    }
+
+    file { '/etc/apt/apt.conf.d/80retry':
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/80retry',
+      replace => true,
+    }
+
+    file { '/etc/apt/apt.conf.d/90no-translations':
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => 'puppet:///modules/openstack_project/90no-translations',
+      replace => true,
+    }
+
     # Custom rsyslog config to disable /dev/xconsole noise on Debuntu servers
     file { '/etc/rsyslog.d/50-default.conf':
       ensure  => present,

modules/openstack_project/manifests/template.pp

@@ -71,30 +71,6 @@ class openstack_project::template (
         },
       }
     }
-
-    file { '/etc/security/limits.d/60-nofile-limit.conf':
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0644',
-      source  => 'puppet:///modules/openstack_project/debian_limits.conf',
-      replace => true,
-    }
-
-    file { '/etc/apt/apt.conf.d/80retry':
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      source  => 'puppet:///modules/openstack_project/80retry',
-      replace => true,
-    }
-
-    file { '/etc/apt/apt.conf.d/90no-translations':
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      source  => 'puppet:///modules/openstack_project/90no-translations',
-      replace => true,
-    }
   }
 
   if ($::operatingsystem == 'CentOS') {