Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339670 )
Change subject: maps: make version of nodejs configurable
......................................................................
maps: make version of nodejs configurable
To help test the transition to node 6 let's make it configurable.
maps-test2004 is the first server used to test this transition
Change-Id: Ieec01058fe1230f7a83fd017bed7028802e0bdcb
---
M hieradata/hosts/maps-test2004.yaml
M modules/role/manifests/maps/server.pp
2 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/hieradata/hosts/maps-test2004.yaml
b/hieradata/hosts/maps-test2004.yaml
index 419fb6d..5a26054 100644
--- a/hieradata/hosts/maps-test2004.yaml
+++ b/hieradata/hosts/maps-test2004.yaml
@@ -1,2 +1,3 @@
cassandra::rack: b5
do_paging: false
+maps::node_version: 6
diff --git a/modules/role/manifests/maps/server.pp
b/modules/role/manifests/maps/server.pp
index f79216f..47b9472 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -19,8 +19,15 @@
$cassandra_hosts = hiera('cassandra::seeds')
# Stick with nodejs 4.6, kartotherian isn't ready for node 6 yet
+ $node_version = hiera('maps::node_version', 4)
+
+ $node_package_version = $node_version ? {
+ 6 => '6.9.1~dfsg-1',
+ default => '4.6.0~dfsg-1+wmf2',
+ }
+
package { 'nodejs':
- ensure => '4.6.0~dfsg-1+wmf2',
+ ensure => $node_package_version,
}
# Some of the following parameters should be externalized in hiera as
--
To view, visit https://gerrit.wikimedia.org/r/339670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieec01058fe1230f7a83fd017bed7028802e0bdcb
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
