Improve overall performance of the node

Closes-Bug: #1619903
Change-Id: Ie045c451a4c37e6cae97fda1d95fc806431f465a
Signed-off-by: Maksim Malchuk <mmalchuk@mirantis.com>

deployment/puppet/openstack_tasks/manifests/roles/controller.pp

@@ -2,12 +2,10 @@ class openstack_tasks::roles::controller {
 
   notice('MODULAR: roles/controller.pp')
 
-  # Pulling hiera
   $primary_controller             = hiera('primary_controller')
   $neutron_mellanox               = hiera('neutron_mellanox', false)
   $use_neutron                    = hiera('use_neutron', false)
 
-  # Do the stuff
   if $neutron_mellanox {
     $mellanox_mode = $neutron_mellanox['plugin']
   } else {
@@ -36,18 +34,9 @@ class openstack_tasks::roles::controller {
     }
   }
 
-  # NOTE(bogdando) for nodes with pacemaker, we should use OCF instead of monit
-
   # BP https://blueprints.launchpad.net/mos/+spec/include-openstackclient
   package { 'python-openstackclient' :
     ensure => installed,
   }
 
-  # Reduce swapiness on controllers, see LP#1413702
-  sysctl::value { 'vm.swappiness':
-    value => '10'
-  }
-
-  # vim: set ts=2 sw=2 et :
-
 }

deployment/puppet/osnailyfacter/manifests/tools/tools.pp

@@ -6,6 +6,9 @@ class osnailyfacter::tools::tools {
   $puppet = hiera('puppet')
   $deployment_mode = hiera('deployment_mode')
 
+  # improve overall performance of the node
+  sysctl::value { 'vm.swappiness': value => '10' }
+
   class { '::osnailyfacter::atop':
     custom_acct_file => $custom_acct_file,
   }

tests/noop/spec/hosts/roles/controller_spec.rb

@@ -8,11 +8,6 @@ manifest = 'roles/controller.pp'
 describe manifest do
   shared_examples 'catalog' do
 
-    it 'should set vm.swappiness sysctl to 10' do
-      should contain_sysctl('vm.swappiness').with(
-        'val' => '10',
-      )
-    end
     it 'should make sure python-openstackclient package is installed' do
       should contain_package('python-openstackclient').with(
         'ensure' => 'installed',

tests/noop/spec/hosts/tools/tools_spec.rb

@@ -99,6 +99,11 @@ describe manifest do
       should contain_package('cloud-init').with({
         'ensure' => 'absent'})
     end
+
+    it 'should set vm.swappiness sysctl to 10' do
+      should contain_sysctl('vm.swappiness').with('val' => '10')
+    end
+
   end
 
   test_ubuntu_and_centos manifest