Andrew Bogott has submitted this change and it was merged. Change subject: puppet-lint: ignore some var in single quoted strings ......................................................................
puppet-lint: ignore some var in single quoted strings We have some use of puppet style variables in single quote string. They are not meant to be interpreted by puppet itself but still cause puppet-lint to complains about it. Use puppet-lint control comments [1] to ignore the few occurences we have. That fix the last puppet-lint error we had in the repository: $ puppet-lint --error-level=error .` $ [1] http://puppet-lint.com/controlcomments/ Bug: T87132 Change-Id: Id00e0a7844a539b7bf3aeeeb22b0887c34326693 --- M manifests/role/gerrit.pp M modules/contint/manifests/packages/labs.pp 2 files changed, 11 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp index 5f430f6..c809126 100644 --- a/manifests/role/gerrit.pp +++ b/manifests/role/gerrit.pp @@ -83,8 +83,11 @@ 'url' => [ # Note: This is in single quotes on purpose. ${name} is not # expected to be expanded by puppet but rather by gerrit + # + # lint:ignore:single_quote_string_with_variables '[email protected]:/srv/ssd/gerrit/${name}.git', '[email protected]:/srv/ssd/gerrit/${name}.git', + # lint:endignore ], 'threads' => '4', 'mirror' => 'true', @@ -92,7 +95,10 @@ 'gitblit' => { # Note: This is in single quotes on purpose. ${name} is not # expected to be expanded by puppet but rather by gerrit + # + # lint:ignore:single_quote_string_with_variables 'url' => '[email protected]:/var/lib/git/${name}.git', + # lint:endignore 'threads' => '4', 'authGroup' => 'mediawiki-replication', 'push' => '+refs/*:refs/*', @@ -101,7 +107,10 @@ 'github' => { # Note: This is in single quotes on purpose. ${name} is not # expected to be expanded by puppet but rather by gerrit + # + # lint:ignore:single_quote_string_with_variables 'url' => '[email protected]:wikimedia/${name}', + # lint:endignore 'threads' => '4', 'authGroup' => 'mediawiki-replication', 'push' => $replication_basic_push_refs, diff --git a/modules/contint/manifests/packages/labs.pp b/modules/contint/manifests/packages/labs.pp index 40b51b1..c6d400e 100644 --- a/modules/contint/manifests/packages/labs.pp +++ b/modules/contint/manifests/packages/labs.pp @@ -15,7 +15,9 @@ apt::conf { 'unattended-upgrades-wikimedia': priority => '51', key => 'Unattended-Upgrade::Allowed-Origins', + # lint:ignore:single_quote_string_with_variables value => 'Wikimedia:${distro_codename}-wikimedia', + # lint:endignore } apt::conf { 'lower-periodic-randomsleep': priority => '51', -- To view, visit https://gerrit.wikimedia.org/r/188805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id00e0a7844a539b7bf3aeeeb22b0887c34326693 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
