jenkins-bot has submitted this change and it was merged.
Change subject: dib: make sure /etc/puppet/* dir are proper symlinks
......................................................................
dib: make sure /etc/puppet/* dir are proper symlinks
Make sure /etc/puppet/ links points to their equivalents under /puppet.
Some directories might exists which causes ln to create the links inside
the subdirectory such as: /etc/puppet/manifests/manifests
Delete unwanted directories before symlinking.
Change-Id: I3891060663f59bab31f6832f989cf6dc9f702b5a
---
M dib/elements/wikimedia/install.d/05-puppet
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dib/elements/wikimedia/install.d/05-puppet
b/dib/elements/wikimedia/install.d/05-puppet
index 3eb2c28..167fb6a 100755
--- a/dib/elements/wikimedia/install.d/05-puppet
+++ b/dib/elements/wikimedia/install.d/05-puppet
@@ -10,6 +10,7 @@
DIB_WIKIMEDIA_PUPPET_DEST=${DIB_WIKIMEDIA_PUPPET_DEST:-/puppet}
mkdir -v -p $(dirname $DIB_WIKIMEDIA_PUPPET_DEST)
+echo "Cloning puppet.git from instance bare mirror"
git clone /srv/git/operations/puppet.git "$DIB_WIKIMEDIA_PUPPET_DEST"
echo "Changing remote from instance mirror to Gerrit..."
@@ -21,10 +22,10 @@
which puppet
echo "Preparing puppet links..."
-ln -s $DIB_WIKIMEDIA_PUPPET_DEST/files /etc/puppet/files
-ln -s $DIB_WIKIMEDIA_PUPPET_DEST/manifests /etc/puppet/manifests
-ln -s $DIB_WIKIMEDIA_PUPPET_DEST/modules /etc/puppet/modules
-ln -s $DIB_WIKIMEDIA_PUPPET_DEST/hieradata /etc/puppet/hieradata
+for dir in files hieradata manifests modules templates; do
+ rm -f -R -v "/etc/puppet/$dir"
+ ln -v -s $DIB_WIKIMEDIA_PUPPET_DEST/$dir /etc/puppet/$dir
+done;
echo "Applying puppet manifests ..."
puppet-apply /tmp/in_target.d/wikimedia-puppet/bootstrap.pp
--
To view, visit https://gerrit.wikimedia.org/r/258143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3891060663f59bab31f6832f989cf6dc9f702b5a
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
