From 3511343f463b64847af6b563ef61776248fb8ebb Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Tue, 28 Apr 2015 00:07:20 +0500 Subject: [PATCH] ./scripts/run: provision tmp/cloud-config.yml as cloud-config --- .gitignore | 1 + scripts/run | 18 +++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f7bb8f07..5ec6b670 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/tmp /assets /state /bin diff --git a/scripts/run b/scripts/run index a49d8186..ddc8d319 100755 --- a/scripts/run +++ b/scripts/run @@ -56,13 +56,17 @@ fi mkdir -p $(dirname $USER_DATA) -echo "#cloud-config" > ${USER_DATA} -echo "ssh_authorized_keys:" >> ${USER_DATA} -for i in ${HOME}/.ssh/*.pub; do - if [ -e $i ]; then - echo " - $(<$i)" >> ${USER_DATA} - fi -done +if [ -e ../../tmp/cloud-config.yml ]; then + cat ../../tmp/cloud-config.yml > ${USER_DATA} +else + echo "#cloud-config" > ${USER_DATA} + echo "ssh_authorized_keys:" >> ${USER_DATA} + for i in ${HOME}/.ssh/*.pub; do + if [ -e $i ]; then + echo " - $(<$i)" >> ${USER_DATA} + fi + done +fi while [ "$#" -gt 0 ]; do case $1 in