diff --git a/Gemfile b/Gemfile index b9191ca..448c924 100644 --- a/Gemfile +++ b/Gemfile @@ -22,9 +22,12 @@ group :development do gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 2.1', require: false + gem "facterdb", '~> 2.1', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "facterdb", '~> 3.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "metadata-json-lint", '~> 4.0', require: false - gem "rspec-puppet-facts", '~> 4.0', require: false + gem "json-schema", '< 5.1.1', require: false + gem "rspec-puppet-facts", '~> 4.0', require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) + gem "rspec-puppet-facts", '~> 5.0', require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "dependency_checker", '~> 1.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false @@ -34,7 +37,6 @@ group :development do gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] - gem "rexml", '>= 3.0.0', '< 3.2.7', require: false gem "github_changelog_generator", '~> 1.15', require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0') gem "overcommit", require: false end diff --git a/metadata.json b/metadata.json index 976859a..57ab7a5 100644 --- a/metadata.json +++ b/metadata.json @@ -79,6 +79,6 @@ ], "description": "ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.", "pdk-version": "3.4.0", - "template-url": "https://github.com/puppetlabs/pdk-templates#3.4.0", - "template-ref": "tags/3.4.0-0-gd3cc13f" + "template-url": "https://github.com/puppetlabs/pdk-templates#3.4.0.2", + "template-ref": "tags/3.4.0.2-0-gd5f5ac1" } diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index 504942b..4675161 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -10,7 +10,7 @@ def get_os_info(facts) zookeeper_shell: nil, } - case facts[:osfamily] + case facts[:os]['family'] when 'Debian' info[:service_name] = 'zookeeper' info[:environment_file] = '/etc/zookeeper/conf/environment' @@ -33,6 +33,8 @@ def get_os_info(facts) info[:should_install_zookeeperd] = false info[:zookeeper_shell] = '/bin/false' info[:init_provider] = 'systemd' + else + raise "Unsupported OS: #{facts[:os]['family']}" end case info[:init_provider] @@ -49,6 +51,5 @@ def get_os_info(facts) else "#{info[:init_dir]}/#{info[:service_name]}" end - info end