From fef2a13c3f7a552ccdd2d4b4321e934a720e0be8 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Tue, 20 Apr 2021 12:08:25 +0100 Subject: [PATCH] Remove puppet5-specific resource_api module dependency The puppetlabs/resource_api module was used for puppet5 to install the puppet-resource_api gem. With puppet6 and later this is not necessary anymore. --- metadata.json | 4 ---- spec/acceptance/types/mysql_login_path_spec.rb | 3 --- 2 files changed, 7 deletions(-) diff --git a/metadata.json b/metadata.json index 8333f0f17..dc6a426f1 100644 --- a/metadata.json +++ b/metadata.json @@ -11,10 +11,6 @@ { "name": "puppetlabs/stdlib", "version_requirement": ">= 3.2.0 < 8.0.0" - }, - { - "name": "puppetlabs/resource_api", - "version_requirement": ">= 1.0.0 < 2.0.0" } ], "operatingsystem_support": [ diff --git a/spec/acceptance/types/mysql_login_path_spec.rb b/spec/acceptance/types/mysql_login_path_spec.rb index cd4f17ce8..fef53855d 100644 --- a/spec/acceptance/types/mysql_login_path_spec.rb +++ b/spec/acceptance/types/mysql_login_path_spec.rb @@ -35,9 +35,6 @@ describe 'setup' do pp = <<-MANIFEST - if versioncmp($::puppetversion, '6.0.0') < 0 { - include resource_api - } user { 'loginpath_test': ensure => present, managehome => true,