Merge branch 'develop' into wip/fix-get-region-from-metadata

Author: hanwen-pcluste

CHANGELOG.md

@@ -3,6 +3,17 @@ aws-parallelcluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the AWS ParallelCluster cookbook.
 
+3.11.1
+------
+
+**CHANGES**
+- Pyxis is now disabled by default, so it must be manually enabled as documented in the product documentation.
+- Upgrade libjwt to version 1.17.0.
+
+**BUG FIXES**
+- Fix an issue in the way we configure the Pyxis Slurm plugin in ParallelCluster that can lead to job submission failures.
+  https://github.com/aws/aws-parallelcluster/issues/6459
+
 3.11.0
 ------
 

cookbooks/aws-parallelcluster-awsbatch/metadata.rb

@@ -7,7 +7,7 @@
 issues_url 'https://github.com/aws/aws-parallelcluster/issues'
 source_url 'https://github.com/aws/aws-parallelcluster-cookbook'
 chef_version '>= 18'
-version '3.11.0'
+version '3.12.0'
 
 depends 'apt', '~> 7.5.22'
 depends 'iptables', '~> 8.0.0'
@@ -17,4 +17,4 @@
 depends 'pyenv', '~> 4.2.3'
 depends 'yum', '~> 7.4.13'
 depends 'yum-epel', '~> 5.0.2'
-depends 'aws-parallelcluster-shared', '~> 3.11.0'
+depends 'aws-parallelcluster-shared', '~> 3.12.0'

cookbooks/aws-parallelcluster-computefleet/metadata.rb

@@ -7,6 +7,6 @@
 issues_url 'https://github.com/aws/aws-parallelcluster-cookbook/issues'
 source_url 'https://github.com/aws/aws-parallelcluster-cookbook'
 chef_version '>= 18'
-version '3.11.0'
+version '3.12.0'
 
-depends 'aws-parallelcluster-shared', '~> 3.11.0'
+depends 'aws-parallelcluster-shared', '~> 3.12.0'

cookbooks/aws-parallelcluster-entrypoints/metadata.rb

@@ -7,11 +7,11 @@
 issues_url 'https://github.com/aws/aws-parallelcluster-cookbook/issues'
 source_url 'https://github.com/aws/aws-parallelcluster-cookbook'
 chef_version '>= 18'
-version '3.11.0'
+version '3.12.0'
 
-depends 'aws-parallelcluster-shared', '~> 3.11.0'
-depends 'aws-parallelcluster-platform', '~> 3.11.0'
-depends 'aws-parallelcluster-environment', '~> 3.11.0'
-depends 'aws-parallelcluster-computefleet', '~> 3.11.0'
-depends 'aws-parallelcluster-slurm', '~> 3.11.0'
-depends 'aws-parallelcluster-awsbatch', '~> 3.11.0'
+depends 'aws-parallelcluster-shared', '~> 3.12.0'
+depends 'aws-parallelcluster-platform', '~> 3.12.0'
+depends 'aws-parallelcluster-environment', '~> 3.12.0'
+depends 'aws-parallelcluster-computefleet', '~> 3.12.0'
+depends 'aws-parallelcluster-slurm', '~> 3.12.0'
+depends 'aws-parallelcluster-awsbatch', '~> 3.12.0'

cookbooks/aws-parallelcluster-environment/metadata.rb

@@ -7,9 +7,9 @@
 issues_url 'https://github.com/aws/aws-parallelcluster-cookbook/issues'
 source_url 'https://github.com/aws/aws-parallelcluster-cookbook'
 chef_version '>= 18'
-version '3.11.0'
+version '3.12.0'
 
 depends 'line', '~> 4.5.13'
 depends 'nfs', '~> 5.1.2'
 
-depends 'aws-parallelcluster-shared', '~> 3.11.0'
+depends 'aws-parallelcluster-shared', '~> 3.12.0'

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

@@ -9,9 +9,10 @@
 # ArmPL
 default['conditions']['arm_pl_supported'] = arm_instance?
 
-# Enroot + Pyxis
+# Enroot
 default['cluster']['enroot']['version'] = '3.4.1'
-default['cluster']['pyxis']['version'] = '0.20.0'
+default['cluster']['enroot']['temporary_dir'] = '/run/enroot'
+default['cluster']['enroot']['persistent_dir'] = '/var/enroot'
 
 # NVidia
 default['cluster']['nvidia']['enabled'] = 'no'

cookbooks/aws-parallelcluster-platform/files/isolated/iso-ca-bundle-config.sh

@@ -2,7 +2,8 @@
 set -ex
 
 function get_instance_region {
-  local _token=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 3600")
+  local _token
+  _token=$(curl -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 3600")
   curl -H "X-aws-ec2-metadata-token: $_token" -v "http://169.254.169.254/latest/meta-data/placement/region" 2> /dev/null
 }
 

cookbooks/aws-parallelcluster-platform/metadata.rb

@@ -7,8 +7,8 @@
 issues_url 'https://github.com/aws/aws-parallelcluster-cookbook/issues'
 source_url 'https://github.com/aws/aws-parallelcluster-cookbook'
 chef_version '>= 18'
-version '3.11.0'
+version '3.12.0'
 
 depends 'line', '~> 4.5.13'
 
-depends 'aws-parallelcluster-shared', '~> 3.11.0'
+depends 'aws-parallelcluster-shared', '~> 3.12.0'

cookbooks/aws-parallelcluster-platform/recipes/config.rb

@@ -26,6 +26,3 @@
 include_recipe 'aws-parallelcluster-platform::supervisord_config'
 fetch_config 'Fetch and load cluster configs'
 include_recipe 'aws-parallelcluster-platform::config_login' if node['cluster']['node_type'] == 'LoginNode'
-enroot 'Configure Enroot' do
-  action :configure
-end

cookbooks/aws-parallelcluster-platform/recipes/install/directories.rb

@@ -21,6 +21,7 @@
 directory node['cluster']['license_dir']
 directory node['cluster']['configs_dir']
 directory node['cluster']['shared_dir']
+directory node['cluster']['examples_dir']
 directory node['cluster']['shared_dir_login_nodes']
 
 # Create ParallelCluster log folder