diff --git a/README.md b/README.md index 9b8a5a77a..73e3bd6f8 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ 1. [Overview](#overview) 1. [Module Description](#module-description) 1. [Setup](#setup) + * [Requirements](#requirements) * [Beginning with Grafana](#beginning-with-grafana) 1. [Usage](#usage) * [Classes and Defined Types](#classes-and-defined-types) @@ -40,6 +41,15 @@ This module will: package source * Perform basic configuration of Grafana +### Requirements + +* If using an operating system of the Debian-based family, and the "repo" +`install_method`, you will need to ensure that +[puppetlabs-apt](https://forge.puppet.com/puppetlabs/apt) version 4.x is +installed. +* If using Docker, you will need the +[garethr/docker](https://forge.puppet.com/garethr/docker) module version 5.x + ### Beginning with Grafana To install Grafana with the default parameters: diff --git a/metadata.json b/metadata.json index 934975e75..ca080ef7c 100644 --- a/metadata.json +++ b/metadata.json @@ -8,10 +8,6 @@ "project_page": "https://github.com/voxpupuli/puppet-grafana", "issue_url": "https://github.com/voxpupuli/puppet-grafana/issues", "dependencies": [ - { - "name": "garethr/docker", - "version_requirement": ">= 5.0.0 < 6.0.0" - }, { "name": "maestrodev/wget", "version_requirement": ">= 1.7.3 < 2.0.0" @@ -20,10 +16,6 @@ "name": "puppet/archive", "version_requirement": ">= 1.0.1 < 2.0.0" }, - { - "name": "puppetlabs/apt", - "version_requirement": ">=2.1.0 < 5.0.0" - }, { "name": "puppetlabs/stdlib", "version_requirement": ">=4.6.0 < 5.0.0" @@ -39,19 +31,22 @@ { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "14.04" + "14.04", + "16.04" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ + "6", "6" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ - "6" + "6", + "7" ] }, { @@ -61,7 +56,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 4.6.1 < 5.0.0" + "version_requirement": ">= 4.7.1 < 6.0.0" } ], "tags": [