From 58d31c5c9a3435b6aca3a318f5dbcdc493e2c6b9 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 17 Nov 2024 19:26:27 +1100 Subject: [PATCH] chore: migrate puppet-r10k - moved puppet-r10k the unkin organisation - ensure branch is set to follow origin/master --- hieradata/roles/infra/puppet/master.yaml | 2 +- site/profiles/manifests/puppet/r10k.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hieradata/roles/infra/puppet/master.yaml b/hieradata/roles/infra/puppet/master.yaml index 562fbfb..c9a7376 100644 --- a/hieradata/roles/infra/puppet/master.yaml +++ b/hieradata/roles/infra/puppet/master.yaml @@ -19,7 +19,7 @@ profiles::puppet::cobbler_enc::packages: - 'requests' - 'PyYAML' 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::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml' profiles::puppet::g10k::environments_path: '/etc/puppetlabs/code/environments' diff --git a/site/profiles/manifests/puppet/r10k.pp b/site/profiles/manifests/puppet/r10k.pp index e366953..9ff76e8 100644 --- a/site/profiles/manifests/puppet/r10k.pp +++ b/site/profiles/manifests/puppet/r10k.pp @@ -22,6 +22,7 @@ class profiles::puppet::r10k ( mode => '0755', content => "#!/bin/bash\n( cd /etc/puppetlabs/r10k + git branch --set-upstream-to=origin/master master git reset --hard master git clean -fd git pull\n)", -- 2.47.3