summaryrefslogtreecommitdiffstats
path: root/tools/kubernetes
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2017-10-18 06:54:02 -0700
committerBryan Sullivan <bryan.sullivan@att.com>2017-10-18 07:12:14 -0700
commit8eecaf79377b31fa0911ab8d84208d9233a6fc6d (patch)
tree32c14a824f409a23d4ced1692c233149c6eb1ec1 /tools/kubernetes
parent5211bda0a619e87aae132af9bb031ead5731ca8c (diff)
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 <bryan.sullivan@att.com>
Diffstat (limited to 'tools/kubernetes')
-rw-r--r--tools/kubernetes/demo_deploy.sh15
1 files changed, 10 insertions, 5 deletions
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!"