X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=nonrtric%2Fhelm%2Fa1controller%2Ftemplates%2Fdeployment.yaml;h=e21ce870f8e48c2ac9d11158debdc1bfa63cb68e;hb=1b94fafc07f3e99986c0b673173ccfc8f7e745cb;hp=bb7b3b5d2389e8351da22cb7648c330240740081;hpb=164dbb725e18a30aea5e342efbb0cc3b0b6a7d35;p=it%2Fdep.git

diff --git a/nonrtric/helm/a1controller/templates/deployment.yaml b/nonrtric/helm/a1controller/templates/deployment.yaml
index bb7b3b5d..e21ce870 100644
--- a/nonrtric/helm/a1controller/templates/deployment.yaml
+++ b/nonrtric/helm/a1controller/templates/deployment.yaml
@@ -44,21 +44,52 @@ spec:
         - name: {{ include "common.containername.a1controller" . }}
           image: {{ .Values.a1controller.image.registry }}/{{ .Values.a1controller.image.name }}:{{ .Values.a1controller.image.tag }}
           imagePullPolicy: {{ .Values.a1controller.imagePullPolicy }}
-          env:
-            - name: MYSQL_ROOT_PASSWORD
-              value: openECOMP1.0
-            - name: SDNC_CONFIG_DIR
-              value: /opt/onap/sdnc/data/properties
           command:
             - /opt/onap/sdnc/bin/startODL.sh
           ports:
-            - containerPort: {{ include "common.serviceport.a1controller.internal" . }}
+            - containerPort: {{ .Values.a1controller.service.targetPort1 }}
+              protocol: TCP
+            - containerPort: {{ .Values.a1controller.service.targetPort2 }}
               protocol: TCP
+          env:
+            - name: MYSQL_ROOT_PASSWORD
+              value: 'itsASecret'
+            - name: MYSQL_USER
+              value: 'sdnctl'
+            - name: MYSQL_PASSWORD
+              value: 'gamma'
+            - name: MYSQL_DATABASE
+              value: 'sdnctl'
+            - name: SDNC_CONFIG_DIR
+              value: '/opt/onap/sdnc/data/properties'
+            - name: SDNC_BIN
+              value: '/opt/onap/sdnc/bin'
+            - name: ODL_CERT_DIR
+              value: '/tmp'
+            - name: ODL_ADMIN_USERNAME
+              value: admin
+            - name: ODL_ADMIN_PASSWORD
+              value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
+            - name: ODL_USERNAME
+              value: admin
+            - name: ODL_PASSWORD
+              value: 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
+            - name: SDNC_DB_INIT
+              value: 'true'
+            - name: A1_TRUSTSTORE_PASSWORD
+              value: 'a1adapter'
+            - name: AAI_TRUSTSTORE_PASSWORD
+              value: 'changeit'
           readinessProbe:
             tcpSocket:
-              port: {{ include "common.serviceport.a1controller.internal" . }}
-            initialDelaySeconds: 15
-            periodSeconds: 15
+              port: {{ .Values.a1controller.service.targetPort1 }}
+            initialDelaySeconds: {{ .Values.a1controller.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.a1controller.readiness.periodSeconds }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.a1controller.service.targetPort1 }}
+            initialDelaySeconds: {{ .Values.a1controller.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.a1controller.liveness.periodSeconds }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -78,12 +109,12 @@ spec:
     spec:
       containers:
         - name: sdnc-db-container
-          image: mysql/mysql-server:5.6
+          image: nexus3.o-ran-sc.org:10001/mariadb:10.5
           imagePullPolicy: IfNotPresent
           env:
             - name: MYSQL_ROOT_HOST
               value: '%'
             - name: MYSQL_ROOT_PASSWORD
-              value: openECOMP1.0
+              value: 'itsASecret'
           ports:
             - containerPort: 3306
\ No newline at end of file