(SIMP-2441) Updated to use new pki scheme (#24)

SIMP-2441 #close
simp · Jan 9, 2017 · 4e85a8f · 4e85a8f
1 parent db9c49f
commit 4e85a8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Mon Jan 09 2016 Nick Markowski <nmarkowski@keywcorp.com> - 6.0.0-0
+- Updated to use new pki scheme.
+
 * Thu Dec 01 2016 Trevor Vaughan <tvaughan@onyxpoint.com> - 6.0.0-0
 - Switched to using puppetlabs/concat
 

diff --git a/spec/acceptance/suites/default/class_spec.rb b/spec/acceptance/suites/default/class_spec.rb
@@ -48,14 +48,7 @@
   let(:hieradata) {
     <<-EOS
 ---
-use_simp_pki : false
-
-pki_dir : '/etc/pki/simp-testing/pki'
-
-stunnel::ca_source : "%{hiera('pki_dir')}/cacerts"
-stunnel::cert : "%{hiera('pki_dir')}/public/%{fqdn}.pub"
-stunnel::key : "%{hiera('pki_dir')}/public/%{fqdn}.pem"
-
+simp_options::pki: false
 rsync::server::stunnel : false
     EOS
   }