unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: change g10k to use a package

Browse Source 
- the archive path is no longer valid
- produced a g10k rpm with rpmbuilder
This commit is contained in:
Ben Vincent 2025-05-31 13:45:18 +10:00
parent ed1a4f6488
commit d9b82b189f
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hieradata/roles/infra/puppet/master.yaml
View File

@ -27,7 +27,7 @@ profiles::puppet::cobbler_enc::packages:
- 'PyYAML' - 'PyYAML'
profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-enc.git profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-enc.git
profiles::puppet::r10k::r10k_repo: https://git.service.au-syd1.consul/unkin/puppet-r10k.git profiles::puppet::r10k::r10k_repo: https://git.service.au-syd1.consul/unkin/puppet-r10k.git
profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k' profiles::puppet::g10k::bin_path: '/usr/bin/g10k'
profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml' profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'
profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments' profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments'
profiles::puppet::g10k::default_environment: 'develop' profiles::puppet::g10k::default_environment: 'develop'

25
site/profiles/manifests/puppet/g10k.pp
View File

@ -1,25 +1,14 @@
# Class: profiles::puppet::g10k # Class: profiles::puppet::g10k
# #
# This class handles downloading and installation of the g10k tool, a fast
# Git and Forge based Puppet environment and module deployment tool.
# The latest release of g10k is downloaded from GitHub and placed into '/opt/puppetlabs/bin'.
# Additionally, it creates a helper script to easily run g10k with the appropriate configuration.
# It also creates a systemd service and timer that runs the g10k script every minute.
class profiles::puppet::g10k ( class profiles::puppet::g10k (
String $bin_path, Stdlib::Absolutepath $bin_path = '/usr/bin/g10k',
String $cfg_path, Stdlib::Absolutepath $cfg_path = '/etc/puppetlabs/r10k/r10k.yaml',
String $environments_path, Stdlib::Absolutepath $environments_path = '/etc/puppetlabs/code/environments',
String $default_environment, String $default_environment = 'develop',
){ ){
archive { '/tmp/g10k.zip': package {'g10k':
ensure => present, ensure => 'latest',
source => 'https://github.com/xorpaul/g10k/releases/latest/download/g10k-linux-amd64.zip',
extract => true,
extract_path => '/opt/puppetlabs/bin',
creates => '/opt/puppetlabs/bin/g10k',
cleanup => true,
require => Package['unzip']
} }
file { '/opt/puppetlabs/bin/puppet-g10k': file { '/opt/puppetlabs/bin/puppet-g10k':
@ -28,7 +17,7 @@ class profiles::puppet::g10k (
group => 'root', group => 'root',
mode => '0755', mode => '0755',
content => template('profiles/puppet/g10k/puppet-g10k.erb'), content => template('profiles/puppet/g10k/puppet-g10k.erb'),
require => Archive['/tmp/g10k.zip'], require => Package['g10k'],
} }
$_timer = @(EOT) $_timer = @(EOT)