annotate hiera.yaml @ 57:3674aac72674 puppet-3.6

Merge Default changes to Puppet 3.6 and fix conflict
author IBBoard <dev@ibboard.co.uk>
date Sun, 26 Jul 2015 17:55:43 +0100
parents 204330fea19a
children ea72ea1f7320
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
1 ---
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
2 :backends: yaml
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
3 :yaml:
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
4 :datadir: /var/lib/hiera
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
5 :hierarchy: common
204330fea19a Use MariaDB on CentOS7 and manage hiera.yaml (to avoid warnings)
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
6 :logger: console