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

Merge pull request 'feat: change enc repo to be tagged' (#42) from neoloc/enc_tagged_release into develop

Browse Source 
Reviewed-on: unkinben/puppet-prod#42
This commit is contained in:
Ben Vincent 2023-11-04 19:14:17 +09:30
commit 30e3afc163
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hieradata/common.yaml
View File

@ -40,7 +40,9 @@ profiles::puppet::client::runtimeout: 3600
profiles::puppet::client::show_diff: true profiles::puppet::client::show_diff: true
profiles::puppet::client::usecacheonfailure: false profiles::puppet::client::usecacheonfailure: false
profiles::puppet::enc::enc_repo: https://git.unkin.net/unkinben/puppet-enc.git profiles::puppet::enc::repo: https://git.unkin.net/unkinben/puppet-enc.git
profiles::puppet::enc::release: '0.1'
profiles::puppet::enc::force: true
profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/puppet-r10k.git profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/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'

8
site/profiles/manifests/puppet/enc.pp
View File

@ -34,7 +34,9 @@
# This is designed to work on Unix-like systems only. # This is designed to work on Unix-like systems only.
# #
class profiles::puppet::enc ( class profiles::puppet::enc (
String $enc_repo, String $repo,
String $release = 'master',
Boolean $force = false,
) { ) {
include profiles::git::git include profiles::git::git
@ -42,7 +44,9 @@ class profiles::puppet::enc (
vcsrepo { '/opt/puppetlabs/enc': vcsrepo { '/opt/puppetlabs/enc':
ensure => latest, ensure => latest,
provider => git, provider => git,
source => $enc_repo, source => $repo,
revision => $release,
force => $force,
require => Package['git'], require => Package['git'],
} }