Andrew Bogott has submitted this change and it was merged.
Change subject: Link private repo to /etc/private
......................................................................
Link private repo to /etc/private
That seems to be what our manifests expect.
Change-Id: I4ee441e8a582e8cbe21f15149ba4a353e9fd1c96
---
M manifests/puppetmaster.pp
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index c1fba0e..31d2a25 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -181,10 +181,6 @@
source =>
"puppet:///files/puppet/git/private/post-merge",
owner => gitpuppet,
mode => 0550;
-
"$puppetmaster::gitdir/operations/puppet/private":
- ensure => link,
- owner => gitpuppet,
- target =>
"${gitdir}/operations/private";
}
}
@@ -223,9 +219,9 @@
target => "${gitdir}/operations/puppet/modules",
force => true,
}
- file { '/etc/puppet/private':
+ file { '/etc/private':
ensure => link,
- target => "${gitdir}/operations/puppet/private",
+ target => "${gitdir}/operations/private",
force => true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/75496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ee441e8a582e8cbe21f15149ba4a353e9fd1c96
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
