Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344107 )
Change subject: maps - remove the pinning of nodejs version
......................................................................
maps - remove the pinning of nodejs version
upgrade to nodejs 6 is happening
Bug: T150354
Change-Id: Ic1f54480bc2bd3cd62ca33d69243e008b83cf2e0
---
M hieradata/hosts/maps-test2001.yaml
M hieradata/hosts/maps-test2002.yaml
M hieradata/hosts/maps-test2003.yaml
M hieradata/hosts/maps-test2004.yaml
M modules/role/manifests/maps/server.pp
5 files changed, 0 insertions(+), 16 deletions(-)
Approvals:
MaxSem: Looks good to me, but someone else must approve
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/hieradata/hosts/maps-test2001.yaml
b/hieradata/hosts/maps-test2001.yaml
index 98e4b06..cf9361f 100644
--- a/hieradata/hosts/maps-test2001.yaml
+++ b/hieradata/hosts/maps-test2001.yaml
@@ -1,6 +1,5 @@
cassandra::rack: a5
do_paging: false
-maps::node_version: 6
role::maps::master::planet_sync_period: 'minute'
role::maps::master::planet_sync_hour: '*'
role::maps::master::planet_sync_minute: '*'
diff --git a/hieradata/hosts/maps-test2002.yaml
b/hieradata/hosts/maps-test2002.yaml
index 8ba8d3b..c5dc28a 100644
--- a/hieradata/hosts/maps-test2002.yaml
+++ b/hieradata/hosts/maps-test2002.yaml
@@ -1,3 +1,2 @@
cassandra::rack: a5
do_paging: false
-maps::node_version: 6
diff --git a/hieradata/hosts/maps-test2003.yaml
b/hieradata/hosts/maps-test2003.yaml
index 5a26054..419fb6d 100644
--- a/hieradata/hosts/maps-test2003.yaml
+++ b/hieradata/hosts/maps-test2003.yaml
@@ -1,3 +1,2 @@
cassandra::rack: b5
do_paging: false
-maps::node_version: 6
diff --git a/hieradata/hosts/maps-test2004.yaml
b/hieradata/hosts/maps-test2004.yaml
index 5a26054..419fb6d 100644
--- a/hieradata/hosts/maps-test2004.yaml
+++ b/hieradata/hosts/maps-test2004.yaml
@@ -1,3 +1,2 @@
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 a6afc85..abba308 100644
--- a/modules/role/manifests/maps/server.pp
+++ b/modules/role/manifests/maps/server.pp
@@ -18,18 +18,6 @@
$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+wmf1',
- default => '4.6.0~dfsg-1+wmf2',
- }
-
- package { 'nodejs':
- ensure => $node_package_version,
- }
-
# Some of the following parameters should be externalized in hiera as
# common parameters shared by multiple roles. For example, statsd or
# logstash configuration should not be specific to maps.
--
To view, visit https://gerrit.wikimedia.org/r/344107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1f54480bc2bd3cd62ca33d69243e008b83cf2e0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
