Ori.livneh has uploaded a new change for review.

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


Change subject: Remove unused (and broken) labs config from squid manifest
......................................................................

Remove unused (and broken) labs config from squid manifest

Per <https://bugzilla.wikimedia.org/show_bug.cgi?id=38524#c2>, squid.pp is not
applied on labs -- which is what I'd expect, given that it references an
undefined function. So: clean it up.

Bug: 38524
Change-Id: I132fef92c4870e0f2a40fa3819f53cf8fcfb4d08
---
M manifests/squid.pp
1 file changed, 0 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/88698/1

diff --git a/manifests/squid.pp b/manifests/squid.pp
index b5abcff..3c8ea07 100644
--- a/manifests/squid.pp
+++ b/manifests/squid.pp
@@ -7,18 +7,6 @@
        # Fast C External redirect helper
        require squid::redirector
 
-       if $realm == "labs" {
-               # Nova mounts /dev/vdb on /mnt by default. We want to use that 
device
-               # for coss usage.
-               mount { "/mnt":
-                       name => '/mnt',
-                       ensure => absent;
-               }
-
-               # FIXME: Hack for arrays in LDAP - you suck puppet
-               $squid_coss_disks = split(get_var('squid_coss_disks'), ',')
-       }
-
        class packages {
                package { ["squid", "squid-frontend"]:
                        ensure => latest;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I132fef92c4870e0f2a40fa3819f53cf8fcfb4d08
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>

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

Reply via email to