Dzahn has submitted this change and it was merged. Change subject: Ignore warnings about URLs without modules for private repository ......................................................................
Ignore warnings about URLs without modules for private repository In most cases, the warnings generated by puppet-lint about "puppet://" URLs without "modules/" (cf. https://integration.wikimedia.org/ci/job/operations-puppet-puppetlint-strict/) are caused by manifests that have not been converted to modules yet. An exception are URLs that refer to the private repository; these are here to stay. This change marks them so that they are ignored by puppet-lint. Bug: T87132 Change-Id: I76d788f86f14bcf008b7ac4c06bcd53eac7b5a32 --- M manifests/role/deployment.pp M modules/releases/manifests/reprepro.pp M modules/releases/manifests/reprepro/upload.pp 3 files changed, 6 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp index 86b91de..b739a2c 100644 --- a/manifests/role/deployment.pp +++ b/manifests/role/deployment.pp @@ -6,7 +6,9 @@ class role::deployment::server( # Source of the key, change this if not in production, with hiera. + # lint:ignore:puppet_url_without_modules $key_source = 'puppet:///private/ssh/tin/mwdeploy_rsa', + # lint:endignore $apache_fqdn = $::fqdn, $deployment_group = 'wikidev', ) { diff --git a/modules/releases/manifests/reprepro.pp b/modules/releases/manifests/reprepro.pp index 104c3f8..02e0cd0 100644 --- a/modules/releases/manifests/reprepro.pp +++ b/modules/releases/manifests/reprepro.pp @@ -24,7 +24,9 @@ homedir => $homedir, options => ["outdir ${outdir}"], gpg_pubring => 'puppet:///modules/releases/pubring.gpg', + # lint:ignore:puppet_url_without_modules gpg_secring => 'puppet:///private/releases/secring.gpg', + # lint:endignore incomingdir => $incomingdir, authorized_keys => ['ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIRN3017QJUoewK7PIKwMo2ojSl4Mu/YxDZC4NsryXmi4kKlCTN0DTeyVSlnDei56EngwYP1crshCCDZAzFECRMV5Hr3NmS/J+ICR0z6GQztd7bQEORot38wxOkOCXBtmqMgztAqyYv6SH3Qfn9qmjrw6/yW0lLqg6cejmYXF61YEYrXyZJm+hjOD1oaYsCdjkuE+3Ob+8t6KvTcvjxarr99RRcuKp67j+7g/HRzxDKGi8/Z8/wFIBu50W/6idhjyPzYIunU5ThFmcpHUdry4jTB1/whuec70wsgcdC6EKPVVp00BfSwBaRJKlVCMWvI1VilLpMC2WtLZXpSQ5iTJ1'], } diff --git a/modules/releases/manifests/reprepro/upload.pp b/modules/releases/manifests/reprepro/upload.pp index b96213c..9089cba 100644 --- a/modules/releases/manifests/reprepro/upload.pp +++ b/modules/releases/manifests/reprepro/upload.pp @@ -1,5 +1,7 @@ class releases::reprepro::upload ( + # lint:ignore:puppet_url_without_modules $private_key = 'puppet:///private/releases/id_rsa.upload', + # lint:endignore $user = 'releases', $group = 'releases', $sudo_user = '%wikidev', -- To view, visit https://gerrit.wikimedia.org/r/198116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76d788f86f14bcf008b7ac4c06bcd53eac7b5a32 Gerrit-PatchSet: 5 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Tim Landscheidt <t...@tim-landscheidt.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
