diff --git a/cookbooks/aws-parallelcluster-platform/files/isolated/iso-ca-bundle-config.sh b/cookbooks/aws-parallelcluster-platform/files/isolated/iso-ca-bundle-config.sh index c72732b7b..9891fa080 100644 --- a/cookbooks/aws-parallelcluster-platform/files/isolated/iso-ca-bundle-config.sh +++ b/cookbooks/aws-parallelcluster-platform/files/isolated/iso-ca-bundle-config.sh @@ -13,4 +13,12 @@ echo "export AWS_CA_BUNDLE=/etc/pki/${REGION}/certs/ca-bundle.pem" >> /etc/profi echo "export AWS_DEFAULT_REGION=${REGION}" >> /etc/profile.d/aws-cli-default-config.sh -echo "Defaults env_keep += \"AWS_DEFAULT_REGION AWS_CA_BUNDLE\"" > /etc/sudoers.d/pcluster-aws-cli-envkeep +echo "export REQUESTS_CA_BUNDLE=${AWS_CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh + +echo "export SSL_CERT_FILE=${AWS_CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh + +echo "Defaults env_keep += \"AWS_DEFAULT_REGION AWS_CA_BUNDLE REQUESTS_CA_BUNDLE SSL_CERT_FILE\"" > /etc/sudoers.d/pcluster-aws-cli-envkeep + +source /etc/profile.d/aws-cli-default-config.sh + +sudo aws configure set ca_bundle "$CA_BUNDLE" \ No newline at end of file diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/fleet_status_manager_program.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/fleet_status_manager_program.erb index fb9c3d822..f5843ca57 100644 --- a/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/fleet_status_manager_program.erb +++ b/cookbooks/aws-parallelcluster-slurm/templates/default/slurm/fleet_status_manager_program.erb @@ -1,2 +1,3 @@ #!/bin/bash +source /etc/profile.d/aws-cli-default-config.sh sudo -u <%= node['cluster']['cluster_admin_user'] %> <%= node_virtualenv_path %>/bin/slurm_fleet_status_manager "$@"