diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2017-10-18 16:52:53 -0700 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2017-10-18 16:52:53 -0700 |
| commit | 3a3e735a4498cc05697842d7b329374fffda90cf (patch) | |
| tree | a67b2bf3145dd405f76f579d68bf15e40532f477 /tools/kubernetes/demo_deploy.sh | |
| parent | 6d5fa696c841d9c032c58f0ac0501a9d1d9e8498 (diff) | |
Tested updates to k8s-cluster and ceph-baremetal
JIRA: MODELS-23
Initial draft of ceph-helm.sh for testing
Change-Id: I39b2edebfe6e9b22de1addd69cc771845495ceb9
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'tools/kubernetes/demo_deploy.sh')
| -rw-r--r-- | tools/kubernetes/demo_deploy.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/kubernetes/demo_deploy.sh b/tools/kubernetes/demo_deploy.sh index 6ac03b5..04dfacb 100644 --- a/tools/kubernetes/demo_deploy.sh +++ b/tools/kubernetes/demo_deploy.sh @@ -30,13 +30,14 @@ #. Usage: on the MAAS server #. $ git clone https://gerrit.opnfv.org/gerrit/models ~/models #. $ bash ~/models/tools/kubernetes/demo_deploy.sh <key> "<hosts>" <master> -#. "<workers>" <pub-net> <priv-net> [<extras>] +#. "<workers>" <pub-net> <priv-net> <ceph-mode> [<extras>] #. <key>: name of private key for cluster node ssh (in current folder) #. <hosts>: space separated list of hostnames managed by MAAS #. <master>: IP of cluster master node #. <workers>: space separated list of agent node IPs #. <pub-net>: CID formatted public network #. <priv-net>: CIDR formatted private network (may be same as pub-net) +#. <ceph-mode>: "helm" or "baremetal" #. <extras>: optional name of script for extra setup functions as needed key=$1 @@ -45,20 +46,21 @@ master=$3 workers="$4" priv_net=$5 pub_net=$6 -extras=$7 +ceph_mode=$7 +extras=$8 -source ~/models/tools/maas/deploy.sh $1 "$2" $5 +source ~/models/tools/maas/deploy.sh $1 "$2" $8 eval `ssh-agent` ssh-add $key if [[ "x$extras" != "x" ]]; then source $extras; fi scp -o StrictHostKeyChecking=no $key ubuntu@$master:/home/ubuntu/$key echo "Setting up kubernetes..." -scp -o StrictHostKeyChecking=no ~/models/tools/kubernetes/k8s-cluster.sh \ +scp -r -o StrictHostKeyChecking=no ~/models/tools/kubernetes/* \ ubuntu@$master:/home/ubuntu/. ssh -x -o StrictHostKeyChecking=no ubuntu@$master <<EOF exec ssh-agent bash ssh-add $key -bash k8s-cluster.sh all "$workers" $priv_net $pub_net +bash k8s-cluster.sh all "$workers" $priv_net $pub_net $ceph_mode EOF # TODO: Figure this out... Have to break the setup into two steps as something # causes the ssh session to end before the prometheus setup, if both scripts |