[MediaWiki-commits] [Gerrit] Put nsswitch_use_default hiera variable somewhere it will be... - change (operations/puppet)

2015-11-23 Thread coren (Code Review) 
coren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/255027

Change subject: Put nsswitch_use_default hiera variable somewhere it will be 
used
..

Put nsswitch_use_default hiera variable somewhere it will be used

Otherwise, it will not be properly taken into account.

Change-Id: If5df5ddaa70abcb8e4e9afb483295fe3294c7619
---
M hieradata/eqiad/labstore/fileserver.yaml
M hieradata/role/common/labs/nfs/fileserver.yaml
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/255027/1

diff --git a/hieradata/eqiad/labstore/fileserver.yaml 
b/hieradata/eqiad/labstore/fileserver.yaml
index e696130..09e3390 100644
--- a/hieradata/eqiad/labstore/fileserver.yaml
+++ b/hieradata/eqiad/labstore/fileserver.yaml
@@ -1,2 +1 @@
 use_ldap: true
-nsswitch_use_default: yes
diff --git a/hieradata/role/common/labs/nfs/fileserver.yaml 
b/hieradata/role/common/labs/nfs/fileserver.yaml
index 8e29d4b..68c8133 100644
--- a/hieradata/role/common/labs/nfs/fileserver.yaml
+++ b/hieradata/role/common/labs/nfs/fileserver.yaml
@@ -1,5 +1,6 @@
 cluster: labsnfs
 standard::has_admin: false
+nsswitch_use_default: yes
 # This is there because we have a ssh::userkey stanza
 # and it will not be used without this hack.  Same
 # pattern ganeti uses.
@@ -13,4 +14,3 @@
 debdeploy::grains:
   debdeploy-labsnfs:
 value: standard
-

-- 
To view, visit https://gerrit.wikimedia.org/r/255027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5df5ddaa70abcb8e4e9afb483295fe3294c7619
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Put nsswitch_use_default hiera variable somewhere it will be... - change (operations/puppet)

2015-11-23 Thread coren (Code Review) 
coren has submitted this change and it was merged.

Change subject: Put nsswitch_use_default hiera variable somewhere it will be 
used
..


Put nsswitch_use_default hiera variable somewhere it will be used

Otherwise, it will not be properly taken into account.

Change-Id: If5df5ddaa70abcb8e4e9afb483295fe3294c7619
---
M hieradata/eqiad/labstore/fileserver.yaml
M hieradata/role/common/labs/nfs/fileserver.yaml
2 files changed, 1 insertion(+), 2 deletions(-)

Approvals:
  coren: Looks good to me, approved
  jenkins-bot: Verified
  Dzahn: Looks good to me, but someone else must approve



diff --git a/hieradata/eqiad/labstore/fileserver.yaml 
b/hieradata/eqiad/labstore/fileserver.yaml
index e696130..09e3390 100644
--- a/hieradata/eqiad/labstore/fileserver.yaml
+++ b/hieradata/eqiad/labstore/fileserver.yaml
@@ -1,2 +1 @@
 use_ldap: true
-nsswitch_use_default: yes
diff --git a/hieradata/role/common/labs/nfs/fileserver.yaml 
b/hieradata/role/common/labs/nfs/fileserver.yaml
index 8e29d4b..68c8133 100644
--- a/hieradata/role/common/labs/nfs/fileserver.yaml
+++ b/hieradata/role/common/labs/nfs/fileserver.yaml
@@ -1,5 +1,6 @@
 cluster: labsnfs
 standard::has_admin: false
+nsswitch_use_default: yes
 # This is there because we have a ssh::userkey stanza
 # and it will not be used without this hack.  Same
 # pattern ganeti uses.
@@ -13,4 +14,3 @@
 debdeploy::grains:
   debdeploy-labsnfs:
 value: standard
-

-- 
To view, visit https://gerrit.wikimedia.org/r/255027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If5df5ddaa70abcb8e4e9afb483295fe3294c7619
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: coren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits