hieradata/roles/apps.yaml

@@ -0,0 +1 @@
+---

hieradata/roles/infra/puppet/master.yaml

@@ -9,8 +9,6 @@ profiles::puppet::autosign::domains:
 #  - 'somenode.main.unkin.net'
 
 profiles::puppet::enc::repo: https://git.unkin.net/unkinben/puppet-enc.git
-profiles::puppet::enc::release: '0.7.1'
-profiles::puppet::enc::force: true
 profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/puppet-r10k.git
 profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k'
 profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'

site/roles/manifests/infra/puppet/master.pp

@@ -1,6 +1,6 @@
 # a role to deploy the puppetmaster
 # work in progress
-class roles::puppet::puppetmaster {
+class roles::infra::puppet::master {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetmaster

site/roles/manifests/infra/puppetboard/server.pp

@@ -1,5 +1,5 @@
 # a role to deploy the puppetboard
-class roles::puppet::puppetboard {
+class roles::infra::puppetboard::server {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetboard

site/roles/manifests/infra/puppetdb/api.pp

@@ -1,5 +1,5 @@
 # a role to deploy the puppetdb api service
-class roles::puppet::puppetdb_api {
+class roles::infra::puppetdb::api {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_api

site/roles/manifests/infra/puppetdb/sql.pp

@@ -1,5 +1,5 @@
 # a role to deploy the puppetdb postgresql service
-class roles::puppet::puppetdb_sql {
+class roles::infra::puppetdb::sql {
     include profiles::defaults
     include profiles::base
     include profiles::puppet::puppetdb_sql

site/roles/manifests/puppet/puppetdb.pp

@@ -1,7 +0,0 @@
-# a role to deploy the puppetdb
-# work in progress
-class roles::puppet::puppetdb {
-    include profiles::defaults
-    include profiles::base
-    include profiles::puppet::puppetdb
-  }