Skip to content

Commit 0021f80

Browse files
committed
[ISO] DO NOT MERGE Custom cookbook to unblock build-image with custom CA bundle.
1 parent 00f5fec commit 0021f80

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ function get_instance_region {
99

1010
REGION="$(get_instance_region)"
1111

12-
CA_BUNDLE="/etc/pki/${REGION}/certs/ca-bundle.pem"
12+
CA_BUNDLE="/etc/pki/tls/${REGION}/certs/ca-bundle.pem"
1313

14-
echo "export AWS_CA_BUNDLE=/etc/pki/${REGION}/certs/ca-bundle.pem" >> /etc/profile.d/aws-cli-default-config.sh
14+
echo "export AWS_CA_BUNDLE=${CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh
1515

1616
echo "export AWS_DEFAULT_REGION=${REGION}" >> /etc/profile.d/aws-cli-default-config.sh
1717

18-
echo "export REQUESTS_CA_BUNDLE=${AWS_CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh
18+
echo "export REQUESTS_CA_BUNDLE=${CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh
1919

20-
echo "export SSL_CERT_FILE=${AWS_CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh
20+
echo "export SSL_CERT_FILE=${CA_BUNDLE}" >> /etc/profile.d/aws-cli-default-config.sh
2121

2222
echo "Defaults env_keep += \"AWS_DEFAULT_REGION AWS_CA_BUNDLE REQUESTS_CA_BUNDLE SSL_CERT_FILE\"" > /etc/sudoers.d/pcluster-aws-cli-envkeep
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
mode '0644'
2424
variables(
2525
region: region,
26-
aws_ca_bundle: region.start_with?('us-iso') ? "/etc/pki/#{region}/certs/ca-bundle.pem" : '',
26+
aws_ca_bundle: region.start_with?('us-iso') ? "/etc/pki/tls/#{region}/certs/ca-bundle.pem" : '',
2727
dcv_configured: (node['cluster']['dcv_enabled'] == "head_node" ||
2828
node['cluster']['dcv_enabled'] == "login_node") &&
2929
dcv_installed?,

0 commit comments

Comments
 (0)