[MediaWiki-commits] [Gerrit] Fix nsswitch_use_default to a string - change (operations/puppet)

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

Change subject: Fix nsswitch_use_default to a string
..


Fix nsswitch_use_default to a string

hiera() returns strings unconditionally so comparisons to true
fails.  Because it would be extra confusing if we compared to 'true'
we switch the required value to 'yes' instead.

Bug: T87870
Change-Id: Iad63049f8ccfab1a1c2c68b1daceb90b1ed67844
---
M hieradata/eqiad/labstore/fileserver.yaml
M modules/ldap/manifests/client/nss.pp
2 files changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/eqiad/labstore/fileserver.yaml 
b/hieradata/eqiad/labstore/fileserver.yaml
index 620e069..e696130 100644
--- a/hieradata/eqiad/labstore/fileserver.yaml
+++ b/hieradata/eqiad/labstore/fileserver.yaml
@@ -1,2 +1,2 @@
 use_ldap: true
-nsswitch_use_default: true
+nsswitch_use_default: yes
diff --git a/modules/ldap/manifests/client/nss.pp 
b/modules/ldap/manifests/client/nss.pp
index 7988237..6f85bce 100644
--- a/modules/ldap/manifests/client/nss.pp
+++ b/modules/ldap/manifests/client/nss.pp
@@ -41,7 +41,7 @@
 # Allow hiera to prevent systemwide nsswitch.conf change
 # (more specifically, force the distro default)
 $nsswitch_source = hiera('nsswitch_use_default', false)? {
-true=> 'file:///usr/share/base-files/nsswitch.conf',
+'yes'   => 'file:///usr/share/base-files/nsswitch.conf',
 default => 'puppet:///modules/ldap/nsswitch.conf',
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] Fix nsswitch_use_default to a string - change (operations/puppet)

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

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

Change subject: Fix nsswitch_use_default to a string
..

Fix nsswitch_use_default to a string

hiera() returns strings unconditionally so comparisons to true
fails.  Because it would be extra confusing if we compared to 'true'
we switch the required value to 'yes' instead.

Bug: T87870
Change-Id: Iad63049f8ccfab1a1c2c68b1daceb90b1ed67844
---
M hieradata/eqiad/labstore/fileserver.yaml
M modules/ldap/manifests/client/nss.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/254885/1

diff --git a/hieradata/eqiad/labstore/fileserver.yaml 
b/hieradata/eqiad/labstore/fileserver.yaml
index 620e069..e696130 100644
--- a/hieradata/eqiad/labstore/fileserver.yaml
+++ b/hieradata/eqiad/labstore/fileserver.yaml
@@ -1,2 +1,2 @@
 use_ldap: true
-nsswitch_use_default: true
+nsswitch_use_default: yes
diff --git a/modules/ldap/manifests/client/nss.pp 
b/modules/ldap/manifests/client/nss.pp
index 7988237..6f85bce 100644
--- a/modules/ldap/manifests/client/nss.pp
+++ b/modules/ldap/manifests/client/nss.pp
@@ -41,7 +41,7 @@
 # Allow hiera to prevent systemwide nsswitch.conf change
 # (more specifically, force the distro default)
 $nsswitch_source = hiera('nsswitch_use_default', false)? {
-true=> 'file:///usr/share/base-files/nsswitch.conf',
+'yes'   => 'file:///usr/share/base-files/nsswitch.conf',
 default => 'puppet:///modules/ldap/nsswitch.conf',
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad63049f8ccfab1a1c2c68b1daceb90b1ed67844
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