From 8eecaf79377b31fa0911ab8d84208d9233a6fc6d Mon Sep 17 00:00:00 2001 From: Bryan Sullivan Date: Wed, 18 Oct 2017 06:54:02 -0700 Subject: Add cloudify folder I forgot. Fix bug in b8s deploy script. JIRA: MODELS-23 Few more tweaks to work with current deployment approach. Change-Id: Ib5257f63f2f4e2948ec7c93aac5c40ae7bb6c37a Signed-off-by: Bryan Sullivan --- tools/kubernetes/demo_deploy.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'tools/kubernetes') diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh index 19feb91..7138224 100644 --- a/tools/kubernetes/demo_deploy.sh +++ b/tools/kubernetes/demo_deploy.sh @@ -43,7 +43,9 @@ key=$1 nodes="$2" admin_ip=$3 agent_ips="$4" -extras=$5 +priv_net=$5 +pub_net=$6 +extras=$7 source ~/models/tools/maas/deploy.sh $1 "$2" $5 eval `ssh-agent` @@ -73,9 +75,12 @@ cd models/tools/prometheus bash prometheus-tools.sh all "$agent_ips" EOF echo "Setting up cloudify..." -scp -o StrictHostKeyChecking=no ~/models/tools/cloudify/k8s-cloudify.sh \ +scp -r -o StrictHostKeyChecking=no ~/models/tools/cloudify \ ubuntu@$admin_ip:/home/ubuntu/. -ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh prereqs -ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh setup -ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip bash k8s-cloudify.sh demo +ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \ + bash cloudify/k8s-cloudify.sh prereqs +ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \ + bash cloudify/k8s-cloudify.sh setup +ssh -x -o StrictHostKeyChecking=no ubuntu@$admin_ip \ + bash cloudify/k8s-cloudify.sh demo echo "All done!" -- cgit 1.2.3-korg