summaryrefslogtreecommitdiff
path: root/hieradata
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2016-11-05 11:41:46 +0100
committerroot <root@puppet.intra.cacert.org>2016-11-05 11:43:06 +0100
commitbef9c83e74228604c5e7ed46c3e308408b5f6ca6 (patch)
tree997a1c116ae1db03430d8dc9005636e8d08fb882 /hieradata
parent1dad9bcf5c2f3212052ce493b08b1a2af754b7f1 (diff)
downloadcacert-puppet-bef9c83e74228604c5e7ed46c3e308408b5f6ca6.tar.gz
cacert-puppet-bef9c83e74228604c5e7ed46c3e308408b5f6ca6.tar.xz
cacert-puppet-bef9c83e74228604c5e7ed46c3e308408b5f6ca6.zip
Restructure to use r10k
This commit adds metadata to the profiles module, introduces a Puppetfile for r10k and moves site specific modules to its own sitemodules directory.
Diffstat (limited to 'hieradata')
-rw-r--r--hieradata/common.yaml2
-rw-r--r--hieradata/nodes/puppet.infra.cacert.org.yaml2
-rw-r--r--hieradata/nodes/svn.infra.cacert.org.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b2e666c..1b33a33 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -1,5 +1,5 @@
---
-users:
+profiles::base::users:
jandd:
username: jandd
fullname: Jan Dittberner
diff --git a/hieradata/nodes/puppet.infra.cacert.org.yaml b/hieradata/nodes/puppet.infra.cacert.org.yaml
index f7bc115..02eee27 100644
--- a/hieradata/nodes/puppet.infra.cacert.org.yaml
+++ b/hieradata/nodes/puppet.infra.cacert.org.yaml
@@ -1,5 +1,5 @@
---
classes:
- roles::puppetmaster
-admins:
+profiles::base::admins:
- jandd
diff --git a/hieradata/nodes/svn.infra.cacert.org.yaml b/hieradata/nodes/svn.infra.cacert.org.yaml
index 760c36b..7a66efe 100644
--- a/hieradata/nodes/svn.infra.cacert.org.yaml
+++ b/hieradata/nodes/svn.infra.cacert.org.yaml
@@ -1,6 +1,6 @@
---
classes:
- roles::svnserver
-admins:
+profiles::base::admins:
- jandd
- law