Andrew Bogott has submitted this change and it was merged.
Change subject: On the labs puppetmaster, link to labs private repo
......................................................................
On the labs puppetmaster, link to labs private repo
Change-Id: If6179dba175eb1c8cab26061a7d4a1c65ffdfb45
---
M manifests/puppetmaster.pp
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index c39b0bc..4757293 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -176,6 +176,16 @@
source =>
"puppet:///files/puppet/git/private/post-merge",
owner => gitpuppet,
mode => 0550;
+ '/etc/puppet/private':
+ ensure => link,
+ target =>
"${gitdir}/operations/private",
+ force => true;
+ }
+ } else {
+ file { '/etc/puppet/private':
+ ensure => link,
+ target => "${gitdir}/operations/labs/private",
+ force => true,
}
}
@@ -212,11 +222,6 @@
file { '/etc/puppet/modules':
ensure => link,
target => "${gitdir}/operations/puppet/modules",
- force => true,
- }
- file { '/etc/puppet/private':
- ensure => link,
- target => "${gitdir}/operations/private",
force => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If6179dba175eb1c8cab26061a7d4a1c65ffdfb45
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
