summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Sullivan <bryan.sullivan@att.com>2017-10-19 12:27:11 -0700
committerBryan Sullivan <bryan.sullivan@att.com>2017-10-19 12:27:11 -0700
commitca7d9beb0ef51458c0f4adff7618b2db176eb87c (patch)
treee3481ac88589b3e7236ffe755fe82a7da3e80a0a
parenta7b45153b1d155f32d335d13c58bcf55ab4a07c0 (diff)
Install ceph for ceph-disk; run helm serve via nohup
JIRA: MODELS-23 Use fork of netarbiter while issues are being worked. Use release name without underscores (issue?). Change-Id: I88b7d585c3c2ded87d37b066a00bb505551da28c Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
-rw-r--r--tools/kubernetes/ceph-helm.sh4
-rw-r--r--tools/kubernetes/k8s-cluster.sh3
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/kubernetes/ceph-helm.sh b/tools/kubernetes/ceph-helm.sh
index 6c92fb0..2df95c5 100644
--- a/tools/kubernetes/ceph-helm.sh
+++ b/tools/kubernetes/ceph-helm.sh
@@ -38,13 +38,13 @@ function setup_ceph() {
dev=$4
# per https://github.com/att/netarbiter/tree/master/sds/ceph-docker/examples/helm
echo "${FUNCNAME[0]}: Clone netarbiter"
- git clone https://github.com/att/netarbiter.git
+ git clone https://github.com/blsaws/netarbiter.git
echo "${FUNCNAME[0]}: Create a .kube/config secret so that a K8s job could run kubectl inside the container"
cd netarbiter/sds/ceph-docker/examples/helm
kubectl create namespace ceph
./create-secret-kube-config.sh ceph
- ./helm-install-ceph.sh my_ceph_chart $private_net $public_net
+ ./helm-install-ceph.sh cephtest $private_net $public_net
kubedns=$(kubectl get service -o json --namespace kube-system kube-dns | \
jq -r '.spec.clusterIP')
diff --git a/tools/kubernetes/k8s-cluster.sh b/tools/kubernetes/k8s-cluster.sh
index 0047527..a5cc07d 100644
--- a/tools/kubernetes/k8s-cluster.sh
+++ b/tools/kubernetes/k8s-cluster.sh
@@ -67,7 +67,7 @@ EOF
sudo apt-get update
# Next command is to workaround bug resulting in "PersistentVolumeClaim is not bound" for pod startup (remain in Pending)
# 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 ceph 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 install jq
@@ -229,6 +229,7 @@ function setup_helm() {
chmod 700 get_helm.sh
./get_helm.sh
helm init
+ nohup helm serve &
helm repo update
# TODO: Workaround for bug https://github.com/kubernetes/helm/issues/2224
# For testing use only!