From bef9c83e74228604c5e7ed46c3e308408b5f6ca6 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sat, 5 Nov 2016 11:41:46 +0100 Subject: 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. --- hieradata/common.yaml | 2 +- hieradata/nodes/puppet.infra.cacert.org.yaml | 2 +- hieradata/nodes/svn.infra.cacert.org.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hieradata') 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 -- cgit v1.2.1