rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-13 13:39:53 +00:00
Code Issues Releases Wiki Activity

Separate cloud init into two phases

Browse Source
This commit is contained in:
Darren Shepherd
2015-03-18 06:26:39 -07:00
parent f21e7e1a90
commit 783e55306c
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/dockerimages/scripts/cloud-init.sh
View File

@@ -14,4 +14,4 @@ fi
rancherctl config get cloud_init rancherctl config get cloud_init
cloud-init -save cloud-init -save -network ${CLOUD_INIT_NETWORK:-true}

5
scripts/dockerimages/scripts/console.sh
View File

@@ -40,6 +40,11 @@ fi
cloud-init -execute 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 setup_ssh
cat > /etc/respawn.conf << EOF cat > /etc/respawn.conf << EOF