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

Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/181

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'

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)",