coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114947
Change subject: Tool Labs: Fixes for eqiad support
......................................................................
Tool Labs: Fixes for eqiad support
Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
---
M modules/toollabs/manifests/init.pp
1 file changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/114947/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 244ce54..b0f6960 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -16,22 +16,25 @@
$store = '/data/project/.system/store'
$repo = '/data/project/.system/deb'
- #
- # The $store is an incredibly horrid workaround the fact that we cannot
- # use exported resources in our puppet setup: individual instances store
- # information in a shared filesystem that are collected locally into
- # files to finish up the configuration.
- #
- # Case in point here: SSH host keys distributed around the project for
- # known_hosts and HBA of the execution nodes.
- #
+ #
+ # The $store is an incredibly horrid workaround the fact that we cannot
+ # use exported resources in our puppet setup: individual instances store
+ # information in a shared filesystem that are collected locally into
+ # files to finish up the configuration.
+ #
+ # Case in point here: SSH host keys distributed around the project for
+ # known_hosts and HBA of the execution nodes.
+ #
file { $store:
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
- require => Service['autofs'],
+ require => $::site? {
+ 'eqiad' => Mount['/data/project'],
+ default => Service['autofs'],
+ },
}
file { "${store}/hostkey-${::fqdn}":
--
To view, visit https://gerrit.wikimedia.org/r/114947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
