From 0d649ead54246854589cfe212f8c3e9403e4536d Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Wed, 15 Mar 2017 17:51:39 +0000
Subject: [PATCH] Bug 1318295 - Vagrant: Move yarn install to shell provisioner

---
 puppet/manifests/classes/nodejs.pp | 11 -----------
 puppet/manifests/vagrant.pp        |  1 -
 vagrant/setup.sh                   |  5 +++++
 3 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 puppet/manifests/classes/nodejs.pp

diff --git a/puppet/manifests/classes/nodejs.pp b/puppet/manifests/classes/nodejs.pp
deleted file mode 100644
index 61cb7886d..000000000
--- a/puppet/manifests/classes/nodejs.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class nodejs {
-
-  exec{"yarn-install":
-    cwd => "${PROJ_DIR}",
-    user => "${APP_USER}",
-    # We have to use `--no-bin-links` to work around symlink issues with Windows hosts.
-    # TODO: Switch the flag to a global yarn pref once yarn adds support.
-    command => "yarn install --no-bin-links",
-  }
-
-}
diff --git a/puppet/manifests/vagrant.pp b/puppet/manifests/vagrant.pp
index 145aab235..63d12e564 100644
--- a/puppet/manifests/vagrant.pp
+++ b/puppet/manifests/vagrant.pp
@@ -18,7 +18,6 @@ file {"/etc/profile.d/treeherder.sh":
 
 class vagrant {
     class {
-        nodejs: before => Class["treeherder"];
         treeherder: before => Class["dev"];
         dev:;
     }
diff --git a/vagrant/setup.sh b/vagrant/setup.sh
index 00b38caa1..bfeb538f8 100644
--- a/vagrant/setup.sh
+++ b/vagrant/setup.sh
@@ -95,6 +95,11 @@ fi
 echo '-----> Running pip install'
 pip install --require-hashes -r requirements/common.txt -r requirements/dev.txt | sed -e '/^Requirement already satisfied:/d'
 
+echo '-----> Running yarn install'
+# We have to use `--no-bin-links` to work around symlink issues with Windows hosts.
+# TODO: Switch the flag to a global yarn pref once yarn adds support.
+yarn install --no-bin-links
+
 echo '-----> Initialising MySQL database'
 # The default `root@localhost` grant only allows loopback interface connections.
 mysql -u root -e 'GRANT ALL PRIVILEGES ON *.* to root@"%"'