File tree Expand file tree Collapse file tree 2 files changed +16
-0
lines changed Expand file tree Collapse file tree 2 files changed +16
-0
lines changed Original file line number Diff line number Diff line change 132132 end
133133end
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
136144if !node [ 'cfncluster' ] [ 'custom_node_package' ] . nil? && !node [ 'cfncluster' ] [ 'custom_node_package' ] . empty?
137145 # Install custom aws-parallelcluster-node package
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
158168elsif 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
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
169185else
170186 python_package "aws-parallelcluster-node" do
171187 version node [ 'cfncluster' ] [ 'cfncluster-node-version' ]
You can’t perform that action at this time.
0 commit comments