Move environment configuration to the config file

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

diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index 1e0a465..cac7eb6 100644 (file)
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -179,18 +179,25 @@ The following instruction should be done outside of INF platform controller host
   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
+
   smo_register_url = http://127.0.0.1:8090/register
   smo_token_data = ${SMO_TOKEN_DATA}
 
+  [OCLOUD]
+  OS_AUTH_URL: ${OS_AUTH_URL}
+  OS_USERNAME: ${OS_USERNAME}
+  OS_PASSWORD: ${OS_PASSWORD}
+  API_HOST_EXTERNAL_FLOATING: ${API_HOST_EXTERNAL_FLOATING}
+
   [API]
-  test = "hello"
 
   [WATCHER]
 
@@ -234,12 +241,14 @@ The following instruction should be done outside of INF platform controller host
 
 
   applicationconfig=`base64 app.conf -w 0`
-  caconfig=`base64 imsserver.crt -w 0`
-  serverkeyconfig=`base64 imsserver.key -w 0`
+  servercrt=`base64 imsserver.crt -w 0`
+  serverkey=`base64 imsserver.key -w 0`
+  smocacrt=`base64 smoca.crt -w 0`
 
   echo $applicationconfig
-  echo $caconfig
-  echo $serverkeyconfig
+  echo $servercrt
+  echo $serverkey
+  echo $smocacrt
 
 
   cat <<EOF>o2service-override.yaml
@@ -251,15 +260,10 @@ The following instruction should be done outside of INF platform controller host
       pullPolicy: IfNotPresent
     logginglevel: "DEBUG"
 
-  ocloud:
-    OS_AUTH_URL: "${OS_AUTH_URL}"
-    OS_USERNAME: "${OS_USERNAME}"
-    OS_PASSWORD: "${OS_PASSWORD}"
-    API_HOST_EXTERNAL_FLOATING: "${API_HOST_EXTERNAL_FLOATING}"
-
   applicationconfig: ${applicationconfig}
-  caconfig: ${caconfig}
-  serverkeyconfig: ${serverkeyconfig}
+  servercrt: ${servercrt}
+  serverkey: ${serverkey}
+  smocacrt: ${smocacrt}
 
   EOF