diff options
author | TP Honey <tphoney@users.noreply.github.com> | 2017-02-22 12:02:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-22 12:02:48 +0000 |
commit | b28b6c86345befe0111df79cfcd3e62e83867b81 (patch) | |
tree | 886f80f629c41796cd23e3b614bd00fd46fde5ac /spec/spec_helper_acceptance.rb | |
parent | 6f160c37ba0883c27baae534ae8dfd45e231cc01 (diff) | |
parent | 3fc7694d9fd46b4647eb562170af48ed819f64ab (diff) |
Merge pull request #723 from tphoney/remove_unsupported_platforms_and_future_parser
remove unsupported platforms and future parser
Diffstat (limited to 'spec/spec_helper_acceptance.rb')
-rwxr-xr-x | spec/spec_helper_acceptance.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 27edff8..4d85e7d 100755 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -4,8 +4,6 @@ require 'beaker-rspec' require 'beaker/puppet_install_helper' require 'beaker/module_install_helper' -UNSUPPORTED_PLATFORMS = [] - run_puppet_install_helper install_ca_certs unless ENV['PUPPET_INSTALL_TYPE'] =~ /pe/i install_module_on(hosts) @@ -17,20 +15,7 @@ RSpec.configure do |c| # Configure all nodes in nodeset c.before :suite do - if ENV['FUTURE_PARSER'] == 'yes' - default[:default_apply_opts] ||= {} - default[:default_apply_opts].merge!({:parser => 'future'}) - end - end -end - -def is_future_parser_enabled? - if default[:type] == 'aio' || ENV['PUPPET_INSTALL_TYPE'] == 'agent' - return true - elsif default[:default_apply_opts] - return default[:default_apply_opts][:parser] == 'future' end - return false end def get_puppet_version |