From b181a0651fb76f0565b2971718922453b7295643 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 20 Aug 2015 17:00:54 +0000
Subject: [PATCH] Upgrade etherpad-dev to Ubuntu Trusty

Upgrade etherpad-dev to Ubuntu Trusty and switch from node.js
compiled from source to the nodejs/npm distro packages there.

Change-Id: Ia1830c88bdd0fc7e934ebbca4fcbfb9996151d13
---
 manifests/site.pp                                   | 2 +-
 modules/openstack_project/manifests/etherpad_dev.pp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index fd62719869..61b4f9bd38 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -344,7 +344,7 @@ node 'etherpad.openstack.org' {
   }
 }
 
-# Node-OS: precise
+# Node-OS: trusty
 node 'etherpad-dev.openstack.org' {
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [22, 80, 443],
diff --git a/modules/openstack_project/manifests/etherpad_dev.pp b/modules/openstack_project/manifests/etherpad_dev.pp
index 54b9aa03b7..d0a939d2cc 100644
--- a/modules/openstack_project/manifests/etherpad_dev.pp
+++ b/modules/openstack_project/manifests/etherpad_dev.pp
@@ -5,7 +5,8 @@ class openstack_project::etherpad_dev (
   $mysql_db_name = 'etherpad-lite'
 ) {
   class { 'etherpad_lite':
-    ep_ensure => 'latest',
+    ep_ensure      => 'latest',
+    nodejs_version => 'system',
   }
 
   class { 'etherpad_lite::apache':