From 9913cb91a58a978de20a50640af5da6fb9cc015e Mon Sep 17 00:00:00 2001
From: Antonio Romero Marin <antonio.romero.marin@cern.ch>
Date: Thu, 2 Mar 2017 18:23:40 +0100
Subject: [PATCH] Update to Augeas systcl module

---
 .fixtures.yml                   | 7 ++++---
 Gemfile                         | 1 +
 manifests/swappiness.pp         | 5 ++---
 metadata.json                   | 8 ++++++--
 spec/classes/swappiness_spec.rb | 1 -
 spec/spec_helper_acceptance.rb  | 3 ++-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 81ed313..dedd611 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -3,8 +3,9 @@ fixtures:
     stdlib:
       repo: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
       ref: 4.7.0
-    sysctl:
-      repo: "git://github.com/fiddyspence/puppet-sysctl.git"
-      ref: 1.1.0
+    augeasproviders_sysctl:
+      repo: "git://github.com/hercules-team/augeasproviders_sysctl.git"
+    augeasproviders_core:
+      repo: "git://github.com/hercules-team/augeasproviders_core.git"
   symlinks:
     swap_file: "#{source_dir}"
diff --git a/Gemfile b/Gemfile
index b2e1904..9fd7eef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,7 @@ group :test do
     gem 'rspec', '~> 2.0'
   end
 
+  gem 'public_suffix', '1.4.6' if RUBY_VERSION < '2.0.0'
   gem 'rake'
   gem 'puppet-lint'
   gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git'
diff --git a/manifests/swappiness.pp b/manifests/swappiness.pp
index 1a6bcdf..998a021 100644
--- a/manifests/swappiness.pp
+++ b/manifests/swappiness.pp
@@ -16,9 +16,8 @@
   validate_integer($swappiness, 100, 0)
 
   sysctl { 'vm.swappiness':
-    ensure    => 'present',
-    permanent => true,
-    value     => $swappiness,
+    ensure => 'present',
+    value  => $swappiness,
   }
 
 }
diff --git a/metadata.json b/metadata.json
index a585b97..8aa3fc2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -56,8 +56,12 @@
       "version_requirement": ">= 4.7.0"
     },
     {
-      "name": "fiddyspence/sysctl",
-      "version_requirement": "1.1.0"
+      "name": "herculesteam/augeasproviders_sysctl",
+      "version_requirement": ">=2.1.0"
+    },
+    {
+      "name": "herculesteam/augeasproviders_core",
+      "version_requirement": ">=2.1.0"
     }
   ]
 }
diff --git a/spec/classes/swappiness_spec.rb b/spec/classes/swappiness_spec.rb
index fee8281..c8534d2 100644
--- a/spec/classes/swappiness_spec.rb
+++ b/spec/classes/swappiness_spec.rb
@@ -9,7 +9,6 @@
   it do
     is_expected.to contain_sysctl('vm.swappiness').
              with({"ensure"=>"present",
-                   "permanent"=>"true",
                    "value"=>"65"})
   end
 end
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index dc47877..de5a947 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -26,7 +26,8 @@
     puppet_module_install(:source => proj_root, :module_name => 'swap_file')
     hosts.each do |host|
       shell('puppet module install puppetlabs-stdlib --version 4.7.0', { :acceptable_exit_codes => [0] })
-      shell('puppet module install fiddyspence-sysctl --version 1.1.0', { :acceptable_exit_codes => [0] })
+      shell('puppet module install herculesteam/augeasproviders_core --version 2.1.0', { :acceptable_exit_codes => [0] })
+      shell('puppet module install herculesteam/augeasproviders_sysctl --version 2.1.0', { :acceptable_exit_codes => [0] })
     end
   end
 end