Faidon Liambotis has submitted this change and it was merged. Change subject: OCG: update trebuchet config and remove Node ......................................................................
OCG: update trebuchet config and remove Node Trebuchet * It didn't make sense to have a completely separate git repo just for deployments. I'm going to use a deploy branch and see how that works out. * According to the documentation, declare the service name in a different way so that `restart-service` works. apt * OCG requires Node 0.10; but WMF has 0.8 in it's repo right now. The installation requirement is causing some havok if I try to use a different version of node. Change-Id: I0a4457f450724e7fbf5c864a3a2e05aed57a231c --- M manifests/role/deployment.pp M modules/ocg/manifests/init.pp 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp index 3479447..30e0967 100644 --- a/manifests/role/deployment.pp +++ b/manifests/role/deployment.pp @@ -97,10 +97,9 @@ }, 'ocg/ocg' => { 'grain' => 'ocg', - 'upstream' => 'https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection/deploy', - 'checkout_module_calls' => { - 'service.restart' => ['ocg'], - }, + 'upstream' => 'https://gerrit.wikimedia.org/r/mediawiki/services/ocg-collection', + 'service_name' => 'ocg', + 'checkout_submodules' => true, }, 'fluoride/fluoride' => { 'grain' => 'fluoride', diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp index fb411b6..ebb8591 100644 --- a/modules/ocg/manifests/init.pp +++ b/modules/ocg/manifests/init.pp @@ -33,10 +33,11 @@ system => true, } - package { 'nodejs': - ensure => present, - notify => Service['ocg'], - } + # Can't use Node installed from Apt until we have 0.10 in the repo + #package { 'nodejs': + # ensure => present, + # notify => Service['ocg'], + #} package { [ -- To view, visit https://gerrit.wikimedia.org/r/107810 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a4457f450724e7fbf5c864a3a2e05aed57a231c Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mwalker <mwal...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Jgreen <jgr...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits