aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-01-28 15:06:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2014-01-28 15:06:44 -0200
commit0aa8510b29568a7001e1f5257c245fb532760a61 (patch)
treeae3d0ea329040938a0bda331d60fcfba1c43247a
parent93ee664156c86145fd460c5ca7b96518a8eb4ecc (diff)
downloadpuppet-bootstrap-0aa8510b29568a7001e1f5257c245fb532760a61.tar.gz
puppet-bootstrap-0aa8510b29568a7001e1f5257c245fb532760a61.tar.bz2
Adding hiera configuration
-rw-r--r--hiera/hiera.yaml14
-rw-r--r--manifests/vagrant.pp41
2 files changed, 51 insertions, 4 deletions
diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
new file mode 100644
index 0000000..f5bc512
--- /dev/null
+++ b/hiera/hiera.yaml
@@ -0,0 +1,14 @@
+---
+:backends:
+ - yaml
+:yaml:
+ :datadir: /etc/puppet/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}'
+ - common
diff --git a/manifests/vagrant.pp b/manifests/vagrant.pp
index 619bc66..94d5896 100644
--- a/manifests/vagrant.pp
+++ b/manifests/vagrant.pp
@@ -1,11 +1,44 @@
# Import main module
import "nodo"
+#
+# Stage definitions
+#
+
+stage { 'first':
+ before => Stage['main'],
+}
+
+stage { 'last': }
+Stage['main'] -> Stage['last']
+
+#
+# Class definitions
+#
+
# Vagrant classes
include nodo::role::vagrant
-# Symlink to the mounted module folder
-file { '/etc/puppet/modules':
- ensure => '/etc/puppet/modules-0',
- force => true,
+class vagrant_config {
+ # Symlink to the mounted module folder
+ file { '/etc/puppet/modules':
+ ensure => '/etc/puppet/modules-0',
+ force => true,
+ }
+
+ # Ensure a custom hiera configuration
+ file { '/etc/puppet/hiera.yaml':
+ owner => root,
+ group => root,
+ mode => 0644,
+ force => true,
+ ensure => '/etc/puppet/hiera/hiera.yaml',
+ }
+}
+
+#
+# Class instantiations
+#
+class { 'vagrant_config':
+ stage => first,
}