aboutsummaryrefslogtreecommitdiff
path: root/hiera/hiera.yaml
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-09-25 18:12:31 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-09-25 18:12:31 -0300
commit4fc808f0673f42c7fae8519d793acea186aa092d (patch)
tree4b30961f69428811a2885aab0eeae3ec7e5804d9 /hiera/hiera.yaml
parent47bc02001105b82d27454020d55e431773e92602 (diff)
downloadpuppet-bootstrap-4fc808f0673f42c7fae8519d793acea186aa092d.tar.gz
puppet-bootstrap-4fc808f0673f42c7fae8519d793acea186aa092d.tar.bz2
Get rid of environments, use git branches instead
Diffstat (limited to 'hiera/hiera.yaml')
-rw-r--r--hiera/hiera.yaml14
1 files changed, 7 insertions, 7 deletions
diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
index 33acc9e..96cfb87 100644
--- a/hiera/hiera.yaml
+++ b/hiera/hiera.yaml
@@ -10,12 +10,12 @@
# See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
:datadir: hiera
:hierarchy:
- - '%{::environment}/domain/%{::domain}/node/%{::clientcert}'
- - '%{::environment}/domain/%{::domain}/role/%{::role}'
- - '%{::environment}/domain/%{::domain}/location/%{::location}'
- - '%{::environment}/domain/%{::domain}/%{::domain}'
- - '%{::environment}/location/%{::location}'
- - '%{::environment}/virtual/%{::virtual}'
- - '%{::environment}/role/%{::role}'
+ - 'domain/%{::domain}/node/%{::clientcert}'
+ - 'domain/%{::domain}/role/%{::role}'
+ - 'domain/%{::domain}/location/%{::location}'
+ - 'domain/%{::domain}/%{::domain}'
+ - 'location/%{::location}'
+ - 'virtual/%{::virtual}'
+ - 'role/%{::role}'
- bootstrap
- common