minor fix and house cleaning

[it/dep.git] / RECIPE_EXAMPLE / RIC_AUX_RECIPE_EXAMPLE

diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index a782caa..a6b11f4 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@ -21,7 +21,7 @@
 global:
   # Docker registry from which RIC platform components pull the images
   repository: nexus3.o-ran-sc.org:10004
-  
+
   # Name of the K8S docker credential that is onboarded by 20-credential 
   repositoryCred: docker-reg-cred
 
@@ -29,7 +29,7 @@ global:
   imagePullPolicy: Always
 
   # Helm repo that will be used by xApp manager
-  helmRepository: nexus.ricinfra.local
+  helmRepository: "http://aux-entry/helm"
 
   # Certificate of the helm repo
   helmRepositoryCert: xapp-mgr-certs
@@ -37,30 +37,77 @@ global:
   # Name of the K8S secret that contains the credential of the helm repo
   helmRepositoryCred: xapp-mgr-creds
 
-  # The name of the tiller that xApp helm client talks to
-  helmRepositoryTiller: tiller-deploy
-
-  # The namespace of the xApp helm tiller
-  helmRepositoryTillerNamespace: kube-system
+  # Endpoint of k8s API server
+  k8sAPIHost: https://kubernetes.default.svc.cluster.local/
 
-  # The port the xApp helm tiller is listening to
-  helmRepositoryTillerPort: 44134
 
+  # The ingress URL definitions for the ingress controller in four namespaces
+  ingressurl:
+    ric: ric-entry
+    aux: aux-entry
 
+  tillers:
+    ricxapp:
+      name: ricxapp
+      nameSpace: ricxapp
+      deployNameSpace: ricinfra
+      image:
+        tillerTLSSecrets:
+          repository: nexus3.o-ran-sc.org:10004
+          name: it-dep-secret
+          tag: 0.0.2
+        tiller:
+          repository: gcr.io
+          name: kubernetes-helm/tiller
+          tag: v2.12.3
+      secret:
+        create: true
+        tillerSecretName: secret-tiller-ricxapp
+        helmSecretName: secret-helm-client-ricxapp
+      tls:
+       authenticate: true
+       verify: true
+      serviceAccount:
+        name: tiller
+        role:
+        - apiGroups: [""]
+          resources: ["pods", "configmaps", "services"]
+          verbs: ["get", "list", "create", "delete"]
+        - apiGroups: ["extensions", "apps"]
+          resources: ["deployments"]
+          verbs: ["get", "list", "create", "delete"]
+      port: 44134
 
-  
 #-------------------------------------------------------------------------
 # Auxiliary Functions
 #-------------------------------------------------------------------------
 dashboard:
+  # Override the name using the following option
+  # nameOverride:
   image:
-    name:: ric-dash-be
-    tag: 1.0.5
+    name: ric-dashboard
+    tag: 1.2.0
   properties:
-    e2mgr:
-      mock:
-        rannames: "ABCD123456, EFGH123456"
+    # application.properties
+    portalapi:
+      username: username
+      password: password
+    metrics:
+      url:
+        ac: http://ric-aux-kibana-server:5601/goto/fedcba9876543210?embed=true
+    # key.properties
+    cipher.enc.key: AGLDdG4D04BKm2IxIWEr8o==
+    # portal.properties
+    # external URL for user browser
+    ecomp_redirect_url: https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
+    # internal URL for backend
+    ecomp_rest_url:     http://portal-app.onap:8989/ONAPPORTAL/auxapi
+    ueb_app_key: uebkey
 
-ext:
-  ip:
-    192.168.130.110
\ No newline at end of file
+extsvcaux:
+  ricip:
+    # The ip address of the ric cluster ingress controller
+    <IP_ADDRESS of the RIC cluster>
+  auxip:
+    # The ip address of the aux cluster ingress controller
+    <IP_ADDRESS of the AUX cluster>