X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docs%2Finstallation-guide.rst;h=af661a96b6c02a0951b5ace4e19494cca22de3b4;hb=c34ab47848138150a1456be2fa9f82d7260e37b8;hp=4c3e2bcf306c7255ee0efb88fa35467055e0f3e0;hpb=12249c7669e487cd9f37cee8475c89eb5490e0f0;p=pti%2Fo2.git diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst index 4c3e2bc..af661a9 100644 --- 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= - NAMESPACE=orano2 + NAMESPACE=oran-o2 TOKEN_DATA= 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 @@ -186,11 +186,11 @@ The following instruction should be done outside of INF platform controller host [DEFAULT] ocloud_global_id = 4e24b97c-8c49-4c4f-b53e-3de5235a4e37 + smo_register_url = http://127.0.0.1:8090/register smo_token_data = ${SMO_TOKEN_DATA} [API] - test = "hello" [WATCHER] @@ -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 <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