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

Merge pull request 'chore: migrate puppet-r10k' (#181) from neoloc/r10k_adjustment into develop

Browse Source 
Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/181
This commit is contained in:
Ben Vincent 2024-11-17 19:27:43 +11:00
commit f097cf2550
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ profiles::puppet::cobbler_enc::packages:
- 'requests' - 'requests'
- '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/unkinben/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: '/opt/puppetlabs/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'

1
site/profiles/manifests/puppet/r10k.pp
View File

@ -22,6 +22,7 @@ class profiles::puppet::r10k (
mode => '0755', mode => '0755',
content => "#!/bin/bash\n( content => "#!/bin/bash\n(
cd /etc/puppetlabs/r10k cd /etc/puppetlabs/r10k
git branch --set-upstream-to=origin/master master
git reset --hard master git reset --hard master
git clean -fd git clean -fd
git pull\n)", git pull\n)",