Separate cloud init into two phases

changeyourname · Mar 18, 2015 · 783e553 · 783e553
1 parent f21e7e1
commit 783e553
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/dockerimages/scripts/cloud-init.sh b/scripts/dockerimages/scripts/cloud-init.sh
@@ -14,4 +14,4 @@ fi
 
 rancherctl config get cloud_init
 
-cloud-init -save
+cloud-init -save -network ${CLOUD_INIT_NETWORK:-true}
diff --git a/scripts/dockerimages/scripts/console.sh b/scripts/dockerimages/scripts/console.sh
@@ -40,6 +40,11 @@ fi
 
 cloud-init -execute
 
+if [ -x /var/lib/rancher/conf/cloud-config-script ]; then
+ echo "Running /var/lib/rancher/conf/cloud-config-script"
+ /var/lib/rancher/conf/cloud-config-script || true
+fi
+
 setup_ssh
 
 cat > /etc/respawn.conf << EOF