From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 2 Nov 2018 22:23:02 +0000 (+0000)
Subject: Merge "Update docker manifests version for OOF"
X-Git-Tag: 3.0.0~88
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fe683c745e31a379bebc0f07fbcd7604484100cc;hp=094b2b59312f401a837347d75119746489aa9208;p=integration.git

Merge "Update docker manifests version for OOF"
---

diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index ed1dc886d..aadc81628 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -203,6 +203,8 @@ cd ~
 
 KUBETOKEN=$(echo -n 'Basic '$(echo -n "$CATTLE_ACCESS_KEY:$CATTLE_SECRET_KEY" | base64 -w 0) | base64 -w 0)
 
+NAMESPACE=onap
+
 # create .kube/config
 cat > ~/.kube/config <<EOF
 apiVersion: v1
@@ -216,6 +218,7 @@ clusters:
 contexts:
 - context:
     cluster: "oom"
+    namespace: "$NAMESPACE"
     user: "oom"
   name: "oom"
 current-context: "oom"
@@ -291,7 +294,7 @@ helm repo list
 make all
 rsync -avt ~/oom/kubernetes/helm/plugins ~/.helm/
 helm search -l | grep local
-helm deploy dev local/onap -f ~/oom/kubernetes/onap/resources/environments/public-cloud.yaml -f ~/integration-override.yaml --namespace onap | tee ~/helm-deploy.log
+helm deploy dev local/onap -f ~/oom/kubernetes/onap/resources/environments/public-cloud.yaml -f ~/integration-override.yaml --namespace $NAMESPACE
 helm list