Skip to content

Commit 9f25f6f

Browse files
committed
Install node dependencies for ubuntu1404
Signed-off-by: Francesco De Martino <[email protected]>
1 parent 5f0e258 commit 9f25f6f

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

recipes/base_install.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@
132132
end
133133
end
134134

135+
# Upgrade six which is installed as distutils package and needed by node deps
136+
if node['platform'] == 'ubuntu' && node['platform_version'] == "14.04"
137+
python_package 'six' do
138+
version '1.12.0'
139+
install_options '--ignore-installed'
140+
end
141+
end
142+
135143
# Check whether install a custom aws-parallelcluster-node package or the standard one
136144
if !node['cfncluster']['custom_node_package'].nil? && !node['cfncluster']['custom_node_package'].empty?
137145
# Install custom aws-parallelcluster-node package
@@ -155,6 +163,8 @@
155163
pip_install_package('aws-parallelcluster-node', node['cfncluster']['cfncluster-node-version'])
156164
end
157165
end
166+
# This elsif branch might be unneeded since node seems to work with custom package
167+
# which is installed without the --no-deps option
158168
elsif node['platform'] == 'ubuntu' && node['platform_version'] == "14.04"
159169
# For Ubuntu 14 manually install dependencies, in order to not break cloud-init
160170
python_package "aws-parallelcluster-node" do
@@ -166,6 +176,12 @@
166176
python_package 'paramiko' do
167177
version '2.4.2'
168178
end
179+
python_package 'future' do
180+
version '0.17.1'
181+
end
182+
python_package 'retrying' do
183+
version '1.3.3'
184+
end
169185
else
170186
python_package "aws-parallelcluster-node" do
171187
version node['cfncluster']['cfncluster-node-version']

util/uploadCookbook.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)