Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Rename ssl related files and variable names to make it more clear. Add SMO...
[pti/o2.git]
/
docs
/
installation-guide.rst
diff --git
a/docs/installation-guide.rst
b/docs/installation-guide.rst
index
1ef39fa
..
0f07760
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>
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"
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
.. code:: shell
- export NAMESPACE=orano2
+ export NAMESPACE=oran
-
o2
kubectl create ns ${NAMESPACE}
# default kube config location is ~/.kube/config
kubectl create ns ${NAMESPACE}
# default kube config location is ~/.kube/config
@@
-179,18
+179,19
@@
The following instruction should be done outside of INF platform controller host
kubectl apply -f smo-serviceaccount.yaml
#export the smo account token data
kubectl apply -f smo-serviceaccount.yaml
#export the smo account token data
- export SMO_TOKEN_DATA=$(kubectl -n default describe secret $(kubectl -n default get secret | grep ${SMO_SERVICEACCOUNT} | awk '{print $1}') | grep "token:" | awk '{print $2}')
+ export SMO_SECRET=$(kubectl -n default get serviceaccounts $SMO_SERVICEACCOUNT -o jsonpath='{.secrets[0].name}')
+ export SMO_TOKEN_DATA=$(kubectl -n default get secrets $SMO_SECRET -o jsonpath='{.data.token}')
#prepare the application config file
cat <<EOF >app.conf
[DEFAULT]
ocloud_global_id = 4e24b97c-8c49-4c4f-b53e-3de5235a4e37
#prepare the application config file
cat <<EOF >app.conf
[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]
smo_register_url = http://127.0.0.1:8090/register
smo_token_data = ${SMO_TOKEN_DATA}
[API]
- test = "hello"
[WATCHER]
[WATCHER]
@@
-232,12
+233,24
@@
The following instruction should be done outside of INF platform controller host
echo 'keyUsage = critical, cRLSign, keyCertSign'; \
echo 'extendedKeyUsage = serverAuth, clientAuth')
echo 'keyUsage = critical, cRLSign, keyCertSign'; \
echo 'extendedKeyUsage = serverAuth, clientAuth')
+
+ applicationconfig=`base64 app.conf -w 0`
+ servercrt=`base64 imsserver.crt -w 0`
+ serverkey=`base64 imsserver.key -w 0`
+ smocacrt=`base64 smoca.crt -w 0`
+
+ echo $applicationconfig
+ echo $servercrt
+ echo $serverkey
+ echo $smocacrt
+
+
cat <<EOF>o2service-override.yaml
o2ims:
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
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"
pullPolicy: IfNotPresent
logginglevel: "DEBUG"
@@
-245,21
+258,24
@@
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}"
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}"
API_HOST_EXTERNAL_FLOATING: "${API_HOST_EXTERNAL_FLOATING}"
+ applicationconfig: ${applicationconfig}
+ servercrt: ${servercrt}
+ serverkey: ${serverkey}
+ smocacrt: ${smocacrt}
+
EOF
EOF
+ cat o2service-override.yaml
+
2.3 Deploy by helm cli
~~~~~~~~~~~~~~~~~~~~~~
.. code:: shell
2.3 Deploy by helm cli
~~~~~~~~~~~~~~~~~~~~~~
.. code:: shell
- config_data=`cat ./path/to/app.conf`
- certification_data=`cat ./path/to/imsserver.crt`
- key_data=`cat ./path/to/imsserver.key`
- helm install o2service o2/charts --set caconfig="$certification_data" --set applicationconfig="$config_data" --set serverkeyconfig="$key_data" -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
helm list |grep o2service
kubectl -n ${NAMESPACE} get pods |grep o2api
kubectl -n ${NAMESPACE} get services |grep o2api