From 09204689baa4448903a8df533b0f50251badfcd2 Mon Sep 17 00:00:00 2001
From: Aaron Sheffield <ajs@sheffieldfamily.net>
Date: Fri, 18 May 2018 12:38:59 -0500
Subject: [PATCH] Executes deploy_site in Airship-Shipyard when Deploying

- Addes a method to deploy_site to install OSH.
- Updated the readme.

Change-Id: Ie0c984a900ff942e4f253ba28694c62234136968
---
 README.md                                   |  2 +-
 manifests/dev_single_node/deploy-airship.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79ba2391..4bbc8d6d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Airship is a broad integration of several components
 enabling an automated, resilient Kubernetes-based infrastructure for hosting
 Helm-deployed containerized workloads.
 
-To get started, run the following in a fresh VM:
+To get started, run the following in a fresh VM.  This will deploy Airship and OSH:
 ```
 sudo -i
 mkdir -p /root/deploy && cd "$_"
diff --git a/manifests/dev_single_node/deploy-airship.sh b/manifests/dev_single_node/deploy-airship.sh
index 1c47e7c4..b1584269 100755
--- a/manifests/dev_single_node/deploy-airship.sh
+++ b/manifests/dev_single_node/deploy-airship.sh
@@ -265,6 +265,16 @@ function setup_deploy_site() {
   set -x
 }
 
+function execute_deploy_site() {
+  set -x
+  echo cd ${WORKSPACE}/site
+  echo source creds.sh
+  echo ./run_shipyard.sh create configdocs design --filename=/home/shipyard/host/deployment_files.yaml
+  echo ./run_shipyard.sh create configdocs secrets --filename=/home/shipyard/host/certificates.yaml --append
+  echo ./run_shipyard.sh commit configdocs
+  echo ./run_shipyard.sh create action deploy_site
+}
+
 
 function clean() {
   # Perform any cleanup of temporary or unused artifacts
@@ -297,3 +307,5 @@ run_genesis || error "running genesis"
 validate_genesis || error "validating genesis"
 genesis_complete || error "printing out some info about next steps"
 setup_deploy_site || error "preparing the /site directory for deploy_site"
+# Disable execute_deploy_site to stop at the Airship components
+execute_deploy_site || error "executing deploy_site from the /site directory"