make sysctl conntrack_max variable

Change-Id: Ia28e26517ba1f79665da945f7ea8e8601138c2d4
NeCTAR-RC · Jun 18, 2014 · 20f9eb7 · 20f9eb7
1 parent db4e8d9
commit 20f9eb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/manifests/node.pp b/manifests/node.pp
@@ -1,4 +1,4 @@
-class swift::node($rsync_connections=2) inherits swift {
+class swift::node($rsync_connections=2, $max_connections=262144) inherits swift {
 
   file { '/etc/rsyncd.conf':
     ensure  => present,
@@ -75,16 +75,16 @@
   }
 
   file { '/etc/sysctl.d/60-swift.conf':
-    owner  => root,
-    group  => root,
-    mode   => '0644',
-    source => 'puppet:///modules/swift/60-swift-sysctl.conf',
-    notify => Exec[sysctl-swift],
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => template('swift/60-swift-sysctl.conf.erb'),
+    notify  => Exec['sysctl-swift'],
   }
 
   exec { 'sysctl-swift':
     command => '/sbin/sysctl -p /etc/sysctl.d/60-swift.conf',
-    unless  => '/usr/bin/test `sysctl -e -n net.nf_conntrack_max` -eq 262144',
+    unless  => "/usr/bin/test `sysctl -e -n net.nf_conntrack_max` -eq $max_connections",
   }
 
   $stg_hosts = hiera('firewall::swift_storage_hosts', [])

diff --git a/files/60-swift-sysctl.conf → templates/60-swift-sysctl.conf.erb b/files/60-swift-sysctl.conf → templates/60-swift-sysctl.conf.erb
@@ -10,4 +10,4 @@ net.ipv4.tcp_tw_reuse=1
 net.ipv4.tcp_syncookies=0
 
 # double amount of allowed conntrack
-net.nf_conntrack_max=262144
+net.nf_conntrack_max=<%= @max_connections %>