Faidon has submitted this change and it was merged.

Change subject: phase out misc::contint::test::packages
......................................................................


phase out misc::contint::test::packages

Got replaced by contint::packages which is in a module.

Change-Id: I3b6d0a71b2c8ee3a22054512c5ede28e263d276e
---
M manifests/misc/contint.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Faidon: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 1cc8e7c..ac70b52 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -27,10 +27,6 @@
 
   system_role { 'misc::contint::test': description => 'continuous integration 
test server' }
 
-  class packages {
-    include contint::packages
-  }
-
   class jenkins {
 
     # Load the Jenkins module
diff --git a/manifests/site.pp b/manifests/site.pp
index 964707c..d876d97 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1001,10 +1001,10 @@
 
     include standard,
         nrpe,
+        contint::packages,
         contint::testswarm,
         contint::website,
         misc::contint::test,
-        misc::contint::test::packages,
         misc::contint::test::jenkins,
         misc::contint::android::sdk,
         role::jenkins::master::production,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b6d0a71b2c8ee3a22054512c5ede28e263d276e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Faidon <[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

Reply via email to