[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::snapshot::common: properly scope included classes
Faidon Liambotis has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377493 ) Change subject: role::snapshot::common: properly scope included classes .. role::snapshot::common: properly scope included classes While the old parser would search classes within the current namespace if their name is not absolute, the future parser does not. So, fix the unfortunate clash of namespaces we had here. Bug: T171704 Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6 --- M modules/role/manifests/snapshot/common.pp 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/manifests/snapshot/common.pp b/modules/role/manifests/snapshot/common.pp index a038d1a..7ee5723 100644 --- a/modules/role/manifests/snapshot/common.pp +++ b/modules/role/manifests/snapshot/common.pp @@ -6,9 +6,8 @@ # mw packages and dependencies, dataset server nfs mount, # config files, stages files, dblists, html templates include ::role::mediawiki::common -include snapshot::dumps +include ::snapshot::dumps # scap3 deployment of dump scripts -include snapshot::deployment +include ::role::snapshot::deployment } - -- To view, visit https://gerrit.wikimedia.org/r/377493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto Gerrit-Reviewer: Faidon Liambotis Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::snapshot::common: properly scope included classes
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/377493 ) Change subject: role::snapshot::common: properly scope included classes .. role::snapshot::common: properly scope included classes While the old parser would search classes within the current namespace if their name is not absolute, the future parser does not. So, fix the unfortunate clash of namespaces we had here. Bug: T171704 Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6 --- M modules/role/manifests/snapshot/common.pp 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/93/377493/1 diff --git a/modules/role/manifests/snapshot/common.pp b/modules/role/manifests/snapshot/common.pp index a038d1a..7ee5723 100644 --- a/modules/role/manifests/snapshot/common.pp +++ b/modules/role/manifests/snapshot/common.pp @@ -6,9 +6,8 @@ # mw packages and dependencies, dataset server nfs mount, # config files, stages files, dblists, html templates include ::role::mediawiki::common -include snapshot::dumps +include ::snapshot::dumps # scap3 deployment of dump scripts -include snapshot::deployment +include ::role::snapshot::deployment } - -- To view, visit https://gerrit.wikimedia.org/r/377493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If41ff38295121de3b09cf97abda1edfd655825e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
