refactor: move puppet::* roles to infra::puppet

- start creation on apps:: roles
- reorganise hieradata to match role changes
- remove tagging for enc repo
This commit is contained in:
Ben Vincent 2023-11-18 18:44:11 +11:00
parent bae3d446b6
commit 460f9bc7e8
8 changed files with 5 additions and 13 deletions

View File

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

View File

@ -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.6'
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'

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
}