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

Merge "Simple-init should disable cloud-init"

Browse Source
This commit is contained in:
Jenkins 2015-05-21 23:29:54 +00:00 committed by Gerrit Code Review
commit 6fb2a28495
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
elements/simple-init/element-deps
View File

@ -1,3 +1,4 @@
cloud-init-datasources
dib-init-system dib-init-system
install-types install-types
source-repositories source-repositories

1
elements/simple-init/environment.d/50-disable-cloud-init Normal file
View File

@ -0,0 +1 @@
export DIB_CLOUD_INIT_DATASOURCES="None"