openstack
/
diskimage-builder
Code Issues Proposed changes

Simple-init should disable cloud-init 

Cloud-init and simple-init are not meant to play together. Lets disable
cloud-init if simple-init is installed.

Also guarding cloud-init-datasources against running in an environment
where cloud-init is not installed.

Change-Id: I5bfa9a3e83d3259db2436404034ad58c780de1c9
This commit is contained in:
Gregory Haynes 2015-05-11 16:48:42 +00:00
parent d8ff69957e
commit dc33f6ddd0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,14 +14,16 @@ 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
if [ -d /etc/cloud/cloud.cfg.d ]; then
# 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
else
cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ]
EOF
fi
fi

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

@ -1,3 +1,4 @@
cloud-init-datasources
dib-init-system
install-types
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"