X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2Fgenerate_yamls.sh;h=111b60349510ddc217fb7d73fca743067418f8b3;hb=96b1112e21fe903fdc0da5e06f324f9856f1a44d;hp=e96f745b23e6c8ebe8d5e99243c752767f04ad51;hpb=c88cf93ab1508f0dd1ec862fc02634604ca9c94d;p=yaml_builds.git

diff --git a/tools/generate_yamls.sh b/tools/generate_yamls.sh
index e96f745..111b603 100755
--- a/tools/generate_yamls.sh
+++ b/tools/generate_yamls.sh
@@ -29,9 +29,27 @@ else
 fi
 
 cd $YAML_BUILDS
+
+# ECHO INPUT FILE TO LOGS FOR TROUBLESHOOTING
+echo "#######################################"
+echo "# USING INPUT FILE [${YAML_BUILDS}/${SITE}.yaml]"
+echo "#######################################"
+sed -E 's/(^.*password:).*/\1 ###PASSWORD REMOVED####/g' ${YAML_BUILDS}/${SITE}.yaml
+echo "#######################################"
+
+echo "# NOTE: root ssh key will be used for genesis_ssh_public_key if no key in yaml"
+RCKEY=$(cat ~/.ssh/id_rsa.pub | sed -e 's/[\/&]/\\&/g')
+sed -i -e "s/genesis_ssh_public_key\:\s*$/genesis_ssh_public_key: \'$RCKEY\'/" $SITE.yaml
+
 python ./scripts/jcopy.py $SITE.yaml ./tools/j2/set_site_env.sh ./tools/env_$SITE.sh
 source ./tools/env_$SITE.sh
 
+if [ ! -d "$AIRSHIP_TREASUREMAP" ] && [ -f "${AIRSHIP_TREASUREMAP}.tgz" ]; then
+  echo "Expanding [${AIRSHIP_TREASUREMAP}.tgz] to directory [$AIRSHIP_TREASUREMAP]."
+  mkdir -p "$AIRSHIP_TREASUREMAP"
+  tar xzvf "${AIRSHIP_TREASUREMAP}.tgz" --strip-components=1 -C "$AIRSHIP_TREASUREMAP"
+fi
+
 if [ ! -d "$AIRSHIP_TREASUREMAP" ]; then
   echo "ERROR: Missing AIRSHIP_TREASUREMAP directory [$AIRSHIP_TREASUREMAP]."
   exit -1
@@ -42,5 +60,30 @@ if [ ! -d "$AIRSHIP_TEMPLATES" ]; then
   exit -1
 fi
 
-python ./scripts/jcopy.py $SITE.yaml AIRSHIP_TEMPLATES $YAML_BUILDS/site/$SITE
-cp -r site/common/* site/$SITE/
+echo "# Generating templates to $YAML_BUILDS/site/$SITE"
+rm -rf $YAML_BUILDS/site/$SITE
+mkdir -p $YAML_BUILDS/site/$SITE
+python ./scripts/jcopy.py $SITE.yaml $AIRSHIP_TEMPLATES $YAML_BUILDS/site/$SITE
+
+echo "# Merging config files to $AIRSHIP_TREASUREMAP/site/$SITE"
+rm -rf $AIRSHIP_TREASUREMAP/site/$SITE
+mkdir -p $AIRSHIP_TREASUREMAP/site/$SITE
+
+cp -r $AIRSHIP_TREASUREMAP/site/seaworthy/* $AIRSHIP_TREASUREMAP/site/$SITE
+cp -r $YAML_BUILDS/site/$SITE/* $AIRSHIP_TREASUREMAP/site/$SITE
+
+CONFIG_COUNT=`find $AIRSHIP_TREASUREMAP/site/$SITE -type f | wc -l`
+echo "#######################################"
+echo "# Created site $AIRSHIP_TREASUREMAP/site/$SITE with $CONFIG_COUNT config files"
+echo "#######################################"
+
+# UNCOMMENT TO DEBUG/LINT GENERATED YAML FILES
+#(
+#echo "# Linting config files in $AIRSHIP_TREASUREMAP/site/$SITE"
+#cd $AIRSHIP_TREASUREMAP
+#$AIRSHIP_TREASUREMAP/tools/airship pegleg site -r /target lint $SITE -x P001 -x P005 || true
+#)
+
+echo "#######################################"
+echo "# $0 finished"
+echo "#######################################"