Merge pull request puppetlabs#956 from pmcmaw/lts_skip_task

(maint) - Skip run_puppet_access_login on LTS
cegeka · Feb 19, 2018 · 7235c96 · 7235c96
2 parents c13f052 + 14f4f79
commit 7235c96
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -87,7 +87,7 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0, 1], &block)
 
   # Configure all nodes in nodeset
   c.before :suite do
-    run_puppet_access_login(user: 'admin') if pe_install?
+    run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
     # Set up selinux if appropriate.
     if fact('osfamily') == 'RedHat' && fact('selinux') == 'true'
       pp = <<-EOS