From c5a15c57452f43fa432372a165acf8ea38a1c2e9 Mon Sep 17 00:00:00 2001
From: Aleksey Zalesov <aleksey.zalesov@altoros.com>
Date: Sat, 24 Feb 2018 14:12:41 +0300
Subject: [PATCH] Configure task to install npm modules

There is a specific module for installing npm modules that should be used
instead of the shell module.
---
 roles/explorer/tasks/main.yml     | 3 ++-
 roles/moc/tasks/main.yml          | 9 ++++++---
 roles/netstat/tasks/main.yml      | 7 +++++--
 roles/poa-netstats/tasks/main.yml | 3 ++-
 roles/validator/tasks/main.yml    | 3 ++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/roles/explorer/tasks/main.yml b/roles/explorer/tasks/main.yml
index f8b8d54..ab6c156 100644
--- a/roles/explorer/tasks/main.yml
+++ b/roles/explorer/tasks/main.yml
@@ -36,7 +36,8 @@
 - file: path={{ home }}/chain-explorer owner={{ username }} group={{ username }} recurse=yes
 
 - name: install npm chain_explorer
-  shell: "cd /home/{{ username }}/chain-explorer; /usr/bin/npm install"
+  npm:
+    path: "/home/{{ username }}/chain-explorer"
   become: true
   become_user: "{{ username }}"
   notify:
diff --git a/roles/moc/tasks/main.yml b/roles/moc/tasks/main.yml
index 646b4f6..7b13d98 100644
--- a/roles/moc/tasks/main.yml
+++ b/roles/moc/tasks/main.yml
@@ -39,16 +39,19 @@
 - file: path={{ home }}/poa-scripts-moc owner={{ username }} group={{ username }} recurse=yes
 
 - name: install npm initial_keys_script
-  shell: "cd {{ home }}/poa-scripts-moc; /usr/bin/npm install"
+  npm:
+    path: "{{ home }}/poa-scripts-moc"
   become: true
   become_user: "{{ username }}"
 
 - name: install npm generateInitialKey
-  shell: "cd {{ home }}/poa-scripts-moc/generateInitialKey; /usr/bin/npm install"
+  npm:
+    path: "{{ home }}/poa-scripts-moc/generateInitialKey"
   become: true
   become_user: "{{ username }}"
 
 - name: install npm distributeTokens
-  shell: "cd {{ home }}/poa-scripts-moc/distributeTokens; /usr/bin/npm install"
+  npm:
+    path: "{{ home }}/poa-scripts-moc/distributeTokens"
   become: true
   become_user: "{{ username }}"
diff --git a/roles/netstat/tasks/main.yml b/roles/netstat/tasks/main.yml
index a1a21f6..af24b1b 100644
--- a/roles/netstat/tasks/main.yml
+++ b/roles/netstat/tasks/main.yml
@@ -12,14 +12,17 @@
 - file: path={{ home }}/eth-netstats owner={{ username }} group={{ username }} recurse=yes
 
 - name: install npm netstats
-  shell: "cd /home/{{ username }}/eth-netstats; /usr/bin/npm install"
+  npm:
+    path: "/home/{{ username }}/eth-netstats"
   become: true
   become_user: "{{ username }}"
   notify:
     - restart poa-dashboard
 
 - name: install npm grunt-cli
-  shell: "cd /home/{{ username }}/eth-netstats; /usr/bin/npm install -g grunt-cli"
+  npm:
+    name: grunt-cli
+    global: yes
 
 - name: run grunt process
   shell: "cd /home/{{ username }}/eth-netstats; grunt"
diff --git a/roles/poa-netstats/tasks/main.yml b/roles/poa-netstats/tasks/main.yml
index fe6dee0..35f0792 100644
--- a/roles/poa-netstats/tasks/main.yml
+++ b/roles/poa-netstats/tasks/main.yml
@@ -25,7 +25,8 @@
 - file: path={{ home }}/eth-net-intelligence-api owner={{ username }} group={{ username }} recurse=yes
 
 - name: install npm netstats
-  shell: "cd /home/{{ username }}/eth-net-intelligence-api; /usr/bin/npm install"
+  npm:
+    path: "/home/{{ username }}/eth-net-intelligence-api"
   become: true
   become_user: "{{ username }}"
   notify:
diff --git a/roles/validator/tasks/main.yml b/roles/validator/tasks/main.yml
index 1f5cf80..9780f70 100644
--- a/roles/validator/tasks/main.yml
+++ b/roles/validator/tasks/main.yml
@@ -41,7 +41,8 @@
 - file: path={{ home }}/poa-scripts-validator owner={{ username }} group={{ username }} recurse=yes
 
 - name: install npm transferRewardToPayoutKey
-  shell: "cd {{ home }}/poa-scripts-validator/transferRewardToPayoutKey; /usr/bin/npm install"
+  npm:
+    path: "{{ home }}/poa-scripts-validator/transferRewardToPayoutKey"
   become: true
   become_user: "{{ username }}"
   notify: