sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Turn off strict_id mode for Ec2 datasource"

Browse Source
This commit is contained in:
Jenkins 2017-05-01 08:04:52 +00:00 committed by Gerrit Code Review
commit c36ac99458
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
View File

@ -24,6 +24,19 @@ EOF
else else
cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ] datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ]
EOF
fi
# Newer cloud-init versions complain by default when they should
# use the Ec2 datasource on a non-AWS cloud. If the Ec2
# datasource is desired, we need to tell cloud-init that we really
# want this. Otherwise there will be ugly warnings or worse.
#
if [[ $DIB_CLOUD_INIT_DATASOURCES =~ Ec2 ]]; then
cat > /etc/cloud/cloud.cfg.d/92-ec2-datasource.cfg <<EOF
#cloud-config
datasource:
Ec2:
strict_id: false
EOF EOF
fi fi
fi fi