sig_cloud/diskimage-builder
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Do not use DatasourceNone for precise cloud-init"

Browse source
This commit is contained in:
Jenkins 2014-06-19 23:31:54 +00:00 committed by Gerrit Code Review
commit 45d5bf45e9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
View file

@ -11,6 +11,14 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then
exit 1
fi
# DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
# which uses cloud-init version 0.6.3
if [ "$(lsb_release -cs)" = 'precise' ] ; then
cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES ]
EOF
else
cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ]
EOF
fi