Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/310729
Change subject: puppet::self::gitclone: Get gitdir from puppetmaster::base_repo ...................................................................... puppet::self::gitclone: Get gitdir from puppetmaster::base_repo To be compatible with conftool::master Change-Id: I574088f7048874e49ac3f825e9212a14c1f3bcb6 --- M modules/puppet/manifests/self/gitclone.pp 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/29/310729/1 diff --git a/modules/puppet/manifests/self/gitclone.pp b/modules/puppet/manifests/self/gitclone.pp index 4994c99..1b8c3e1 100644 --- a/modules/puppet/manifests/self/gitclone.pp +++ b/modules/puppet/manifests/self/gitclone.pp @@ -3,12 +3,10 @@ # for use by puppet::self::masters. # class puppet::self::gitclone { - $gitdir = '/var/lib/git' $volatiledir = '/var/lib/puppet/volatile' - class { '::puppetmaster::base_repo': - gitdir => $gitdir, - } + require ::puppetmaster::base_repo + $gitdir = $::puppetmaster::base_repo::gitdir file { "${gitdir}/labs": ensure => directory, -- To view, visit https://gerrit.wikimedia.org/r/310729 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I574088f7048874e49ac3f825e9212a14c1f3bcb6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits