Alexandros Kosiaris has submitted this change and it was merged.

Change subject: puppet-lint runs through now, changed scope of variable from 
$hostname to $::hostname
......................................................................


puppet-lint runs through now, changed scope of variable from $hostname to 
$::hostname

Change-Id: I2767850c990c7950a77f9d150c066639c16469a8
---
M manifests/role/mariadb.pp
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index f5cb2aa..b120594 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -808,10 +808,7 @@
         shard => 'parsercache',
     }
 
-    # FIXME - top-scope var without namespace, will break in puppet 2.8
-    # lint:ignore:variable_scope
-    $basedir = $hostname ? {
-    # lint:endignore
+    $basedir = $::hostname ? {
         /pc100[123]/ => '/a',
         default      => '/srv',
     }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2767850c990c7950a77f9d150c066639c16469a8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mschon <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to