Merge "Update opMulti operations of the filter"

[pti/o2.git] / docs / installation-guide.rst

diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 4c3e2bc..1e0a465 100644 (file)
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -95,7 +95,7 @@ The following instruction should be done outside of INF platform controller host
   echo "source <(helm completion bash)" >> ~/.bashrc
 
   OAM_IP=<INF OAM IP>
-  NAMESPACE=orano2
+  NAMESPACE=oran-o2
   TOKEN_DATA=<TOKEN_DATA from INF>
 
   USER="admin-user"
@@ -125,7 +125,7 @@ The following instruction should be done outside of INF platform controller host
 
 .. code:: shell
 
-  export NAMESPACE=orano2
+  export NAMESPACE=oran-o2
   kubectl create ns ${NAMESPACE}
 
   # default kube config location is ~/.kube/config
@@ -232,12 +232,22 @@ The following instruction should be done outside of INF platform controller host
     echo 'keyUsage = critical, cRLSign, keyCertSign'; \
     echo 'extendedKeyUsage = serverAuth, clientAuth')
 
+
+  applicationconfig=`base64 app.conf -w 0`
+  caconfig=`base64 imsserver.crt -w 0`
+  serverkeyconfig=`base64 imsserver.key -w 0`
+
+  echo $applicationconfig
+  echo $caconfig
+  echo $serverkeyconfig
+
+
   cat <<EOF>o2service-override.yaml
   o2ims:
-    imagePullSecrets: admin-orano2-registry-secret
+    serviceaccountname: admin-oran-o2
     image:
       repository: nexus3.o-ran-sc.org:10004/o-ran-sc/pti-o2imsdms
-      tag: 1.0.0
+      tag: 2.0.0
       pullPolicy: IfNotPresent
     logginglevel: "DEBUG"
 
@@ -245,18 +255,23 @@ The following instruction should be done outside of INF platform controller host
     OS_AUTH_URL: "${OS_AUTH_URL}"
     OS_USERNAME: "${OS_USERNAME}"
     OS_PASSWORD: "${OS_PASSWORD}"
-    K8S_KUBECONFIG: "/opt/k8s_kube.conf"
     API_HOST_EXTERNAL_FLOATING: "${API_HOST_EXTERNAL_FLOATING}"
 
+  applicationconfig: ${applicationconfig}
+  caconfig: ${caconfig}
+  serverkeyconfig: ${serverkeyconfig}
+
   EOF
 
+  cat o2service-override.yaml
+
 
 2.3 Deploy by helm cli
 ~~~~~~~~~~~~~~~~~~~~~~
 
 .. code:: shell
 
-  helm install o2service o2/charts --set-file caconfig="./imsserver.crt"  --set-file applicationconfig="./app.conf"  --set-file serverkeyconfig="./imsserver.key" -f o2service-override.yaml
+  helm install o2service o2/charts -f o2service-override.yaml
   helm list |grep o2service
   kubectl -n ${NAMESPACE} get pods |grep o2api
   kubectl -n ${NAMESPACE} get services |grep o2api