# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1577638051 0
# Node ID ea72ea1f7320c99ece1d281e325892206916fba3
# Parent  f99974dc0f1a63b50611c5da6b8c1a87494c30ec
Update Hiera to fix warnings

Also removed "use virtual packages" setting because I don't
remember why we have it (other than it being an old default
that changed) and it could be useful if it does what I think
it does!

diff -r f99974dc0f1a -r ea72ea1f7320 hiera.yaml
--- a/hiera.yaml	Sun Dec 29 16:43:55 2019 +0000
+++ b/hiera.yaml	Sun Dec 29 16:47:31 2019 +0000
@@ -1,6 +1,3 @@
----
-:backends: yaml
-:yaml:
-  :datadir: /var/lib/hiera
-:hierarchy: common
-:logger: console
\ No newline at end of file
+
+# Let the system set defaults
+version: 5
diff -r f99974dc0f1a -r ea72ea1f7320 manifests/site.pp
--- a/manifests/site.pp	Sun Dec 29 16:43:55 2019 +0000
+++ b/manifests/site.pp	Sun Dec 29 16:47:31 2019 +0000
@@ -1,9 +1,1 @@
-Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin" }
-
-if versioncmp($::puppetversion, '3.6.1') >= 0 {
-	$allow_virtual_packages = hiera('allow_virtual_packages', false)
-
-	Package {
-		allow_virtual => $allow_virtual_packages,
-	}
-}
+Exec { path => "/usr/bin:/usr/sbin/:/bin:/sbin" }
\ No newline at end of file
diff -r f99974dc0f1a -r ea72ea1f7320 manifests/templates.pp
--- a/manifests/templates.pp	Sun Dec 29 16:43:55 2019 +0000
+++ b/manifests/templates.pp	Sun Dec 29 16:47:31 2019 +0000
@@ -18,12 +18,10 @@
 
 	file { '/etc/puppet/hiera.yaml':
 		ensure => present,
-		content => "---
-:backends: yaml
-:yaml:
-  :datadir: /var/lib/hiera
-:hierarchy: common
-:logger: console",
+		content => "
+# Let the system set defaults
+version: 5
+",
 	}
 }