From 50f598756f6bec6e1bff9aeba01407a7d57f1d08 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sat, 18 Oct 2025 21:52:47 +1100
Subject: [PATCH] feat: migrate puppetserver -> openvox-server

- enable openvox repo
- ensure puppetdb-termini and puppetserver are purged
- set openvox-server as the package to install
- set termini package to openvoxdb-termini
---
 hieradata/roles/infra/puppet.yaml              |  2 +-
 hieradata/roles/infra/puppet/master.yaml       |  5 -----
 site/profiles/manifests/puppet/puppetmaster.pp | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/hieradata/roles/infra/puppet.yaml b/hieradata/roles/infra/puppet.yaml
index 028acf6..d503a5d 100644
--- a/hieradata/roles/infra/puppet.yaml
+++ b/hieradata/roles/infra/puppet.yaml
@@ -1,3 +1,3 @@
 ---
 profiles::packages::include:
-  puppetserver: {}
+  openvox-server: {}
diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml
index 12b6909..f1a7010 100644
--- a/hieradata/roles/infra/puppet/master.yaml
+++ b/hieradata/roles/infra/puppet/master.yaml
@@ -19,11 +19,6 @@ profiles::puppet::autosign::domains:
 # profiles::puppet::autosign::nodes:
 #  - 'somenode.main.unkin.net'
 
-# not ready to migrate puppet masters yet
-profiles::puppet::agent::version: '7.34.0'
-profiles::puppet::agent::openvox_enable: false
-
-
 profiles::puppet::cobbler_enc::cobbler_scheme: https
 profiles::puppet::cobbler_enc::cobbler_hostname: cobbler.main.unkin.net
 profiles::puppet::cobbler_enc::version: 'system'
diff --git a/site/profiles/manifests/puppet/puppetmaster.pp b/site/profiles/manifests/puppet/puppetmaster.pp
index 17bb350..35d326d 100644
--- a/site/profiles/manifests/puppet/puppetmaster.pp
+++ b/site/profiles/manifests/puppet/puppetmaster.pp
@@ -20,12 +20,23 @@ class profiles::puppet::puppetmaster (
     include profiles::puppet::puppetca
     include profiles::puppet::eyaml
 
+    # migration to openvox, cleanup puppetserver/puppetdb-termini
+    package {'puppetdb-termini':
+      ensure => purged,
+      before => Package['openvoxdb-termini'],
+    }
+    package {'puppetserver':
+      ensure => purged,
+      before => Package['openvox-server'],
+    }
+
     class { 'puppetdb::master::config':
       puppetdb_server     => $puppetdb_host,
       manage_storeconfigs => false,
+      terminus_package    => 'openvoxdb-termini',
     }
 
-    Package['puppetserver']
+    Package['openvox-server']
     -> Class['profiles::puppet::gems']
     -> Class['profiles::puppet::r10k']
     -> Class['profiles::puppet::g10k']