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/k8s-cluster.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/k8s-cluster.sh')
| -rw-r--r-- | tools/kubernetes/k8s-cluster.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/kubernetes/k8s-cluster.sh b/tools/kubernetes/k8s-cluster.sh index 015e217..fc40b65 100644 --- a/tools/kubernetes/k8s-cluster.sh +++ b/tools/kubernetes/k8s-cluster.sh @@ -69,6 +69,8 @@ sudo apt-get update # TODO: reverify if this is still an issue in the final working script sudo apt-get -y install ceph-common sudo apt-get -y install --allow-downgrades kubectl=${KUBE_VERSION}-00 kubelet=${KUBE_VERSION}-00 kubeadm=${KUBE_VERSION}-00 +# Needed for ceph setup etc +sudo apt-get -y jq EOG } @@ -247,10 +249,10 @@ function setup_helm() { } function setup_ceph() { - if [[ "$4" .eq "helm" ]]; then - source ./ceph-helm.sh "$1" $2 $3 $4 + if [[ "$4" == "helm" ]]; then + source ./ceph-helm.sh "$1" $2 $3 $5 else - source ./ceph-baremetal.sh "$1" $2 $3 $4 + source ./ceph-baremetal.sh "$1" $2 $3 $5 fi } |