openstack
/
diskimage-builder
Code Issues Proposed changes

Only use Ec2 cloud-init data source for Ubuntu 

Default to only having cloud-init query Ec2 on first boot for Ubuntu,
until cloud-init has been SRU'd to fix the CloudSigma data source issue
that causes Trusty boots to hang.

Change-Id: Icb3734d5ae78f4a0a6c0fae1af4a2ce3c809308c
Partial-bug: #1316475
This commit is contained in:
Adam Gandelman 2014-06-03 14:54:22 -07:00
parent f645287ec4
commit f61c1acf81
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/ubuntu/element-deps
View File

@ -1,4 +1,5 @@
cache-url
cloud-init-datasources
dib-run-parts
dkms
dpkg
dpkg

4
elements/ubuntu/environment.d/99-cloud-init-datasources.bash Normal file
View File

@ -0,0 +1,4 @@
# NOTE(adam_g): Until (LP: #1316475) is resolved in Ubuntu, default to only
# allowing the Ec2 data source from being queried on first boot, unless
# specified otherwise.
export DIB_CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"Ec2"}