openstack/diskimage-builder
Code Issues Proposed changes

Merge "Only use Ec2 cloud-init data source for Ubuntu"

Browse Source
This commit is contained in:
Jenkins
2014-06-10 23:06:27 +00:00
committed by Gerrit Code Review
parent 343f70cd23 f61c1acf81
commit 336398d57a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
elements/ubuntu/element-deps
View File

@@ -1,4 +1,5 @@
cache-url cache-url
cloud-init-datasources
dib-run-parts dib-run-parts
dkms 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"}