Fix Deployment Scripts

Change-Id: If1c0a3de14e8ebf89807c4597891e8d842aa4f4f
Signed-off-by: diwakar thyagaraj <diwakar.chitoor.thyagaraj@att.com>

tools/deployment/apparmor/010-ceph-utility.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 set -xe
 namespace="utility"
+CURRENT_DIR="$(pwd)"
+
 : ${OSH_INFRA_PATH:="../../openstack-helm-infra"}
-cd ${OSH_INFRA_PATH}
+cd "${OSH_INFRA_PATH}"
 
 for CHART in ceph-mon ceph-client ceph-provisioners; do
   make "${CHART}"
@@ -176,14 +178,6 @@ manifests:
   job_bootstrap: false
 EOF
 
-tee /tmp/ceph-osd.yaml <<EOF
-pod:
-  mandatory_access_control:
-    type: apparmor
-    ceph-osd-default:
-      ceph-osd-default: localhost/docker-default
-EOF
-
 for CHART in ceph-mon ceph-client ceph-provisioners; do
   helm upgrade --install ${CHART} ./${CHART} \
     --namespace=ceph \
@@ -193,8 +187,7 @@ for CHART in ceph-mon ceph-client ceph-provisioners; do
 done
   helm upgrade --install ceph-osd ./ceph-osd \
     --namespace=ceph \
-    --values=/tmp/ceph.yaml \
-    --values=/tmp/ceph-osd.yaml
+    --values=/tmp/ceph.yaml
 
   #NOTE: Wait for deploy
   ./tools/deployment/common/wait-for-pods.sh ceph
@@ -236,23 +229,24 @@ conf:
 EOF
 
 
-helm upgrade --install ceph-utility-config ${OSH_INFRA_PATH}/ceph-provisioners \
+helm upgrade --install ceph-utility-config ./ceph-provisioners \
   --namespace=utility \
   --values=/tmp/ceph-utility-config.yaml \
   ${OSH_EXTRA_HELM_ARGS} \
   ${OSH_EXTRA_HELM_ARGS_CEPH_NS_ACTIVATE}
 
+#Deploy Ceph-Utility
+
 kubectl label nodes --all openstack-helm-node-class=primary --overwrite
-pwd
-cd ../porthole
+cd ${CURRENT_DIR}
 helm dependency update charts/ceph-utility
-cd charts
-
-helm upgrade --install ceph-utility ./ceph-utility --namespace=$namespace
 
+helm upgrade --install ceph-utility ./charts/ceph-utility --namespace=$namespace
 sleep 180
 kubectl get pods --namespace=$namespace
 
+#Validate Apparmor
+
 ceph_pod=$(kubectl get pods --namespace=$namespace  -o wide | grep ceph |  grep 1/1  | awk '{print $1}')
 expected_profile="docker-default (enforce)"
 profile=`kubectl -n $namespace exec $ceph_pod -- cat /proc/1/attr/current`

tools/deployment/utilities/010-ceph-utility.sh

@@ -2,7 +2,7 @@
 set -xe
 
 #NOTE: Lint and package chart
-: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
+: ${OSH_INFRA_PATH:="../../openstack-helm-infra"}
 make -C ${OSH_INFRA_PATH} ceph-provisioners
 
 #NOTE: Deploy command
@@ -31,6 +31,7 @@ conf:
   rgw_ks:
     enabled: true
 EOF
+# Deploy Ceph Dependency Pods
 helm upgrade --install ceph-utility-config ${OSH_INFRA_PATH}/ceph-provisioners \
   --namespace=utility \
   --values=/tmp/ceph-utility-config.yaml \

tools/deployment/utilities/020-compute-utility.sh

@@ -5,7 +5,6 @@ kubectl label nodes --all openstack-helm-node-class=primary --overwrite
 
 helm dependency update charts/compute-utility
 cd charts
-kubectl label nodes --all openstack-helm-node-class=primary --overwrite
 helm  upgrade --install compute-utility ./compute-utility --namespace=utility
 
 #NOTE: Validate Deployment info