Mercurial > repos > other > Puppet
changeset 264:ea72ea1f7320
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!
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 29 Dec 2019 16:47:31 +0000 |
| parents | f99974dc0f1a |
| children | bf2b8912c414 |
| files | hiera.yaml manifests/site.pp manifests/templates.pp |
| diffstat | 3 files changed, 8 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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 +", } }