From f9520431c34364ea3a897b9297b616f29de6b3c7 Mon Sep 17 00:00:00 2001 From: Nate Riffe Date: Mon, 10 Oct 2016 06:58:48 -0500 Subject: [PATCH] Update to support puppet 4 --- data/hiera.yaml | 4 ---- hiera.yaml | 8 ++++---- metadata.json | 5 ++--- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 data/hiera.yaml diff --git a/data/hiera.yaml b/data/hiera.yaml deleted file mode 100644 index 5e07a88..0000000 --- a/data/hiera.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# ex: si ts=2 sw=2 et -:hierarchy: - - osfamily/%{::osfamily} - - common diff --git a/hiera.yaml b/hiera.yaml index f97619f..1baae4a 100644 --- a/hiera.yaml +++ b/hiera.yaml @@ -2,8 +2,8 @@ version: 4 datadir: data hierarchy: - - name: "OS family" - backend: yaml - path: "osfamily/%{facts.os.family}" - - name: "common" + - name: "Platform" backend: yaml + paths: + - "osfamily/%{facts.os.family}" + - "common" diff --git a/metadata.json b/metadata.json index d2a00a1..bbea729 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "inkblot/bind", - "version": "6.0.1", + "version": "7.0.0", "author": "inkblot", "license": "Apache-2.0", "summary": "ISC BIND name server", @@ -28,8 +28,7 @@ ], "dependencies": [ { "name": "puppetlabs/stdlib" }, - { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" }, - { "name": "ripienaar/module_data", "version_requirement": ">=0.0.3" } + { "name": "puppetlabs/concat", "version_requirement": ">=1.0.0 <2.0.0" } ], "data_provider": "hiera" }