X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=charts%2Ftemplates%2Fdeployment.yaml;h=7497d9f95e908250a716ea56c1b353fea60115c9;hb=refs%2Fchanges%2F91%2F7591%2F2;hp=cdb54d6e350e6d6bb9cb5f5b273231ddd00d22c5;hpb=5e02e76308e1677fb106572b885a366eb6c0fbec;p=pti%2Fo2.git

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
index cdb54d6..7497d9f 100644
--- a/charts/templates/deployment.yaml
+++ b/charts/templates/deployment.yaml
@@ -50,44 +50,41 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: o2api
-          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+        - name: redis
+          image: redis:alpine
           ports:
-            - containerPort: 80
+            - containerPort: 6379
+        - name: o2pubsub
+          image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
+          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
           env:
-            - name: API_HOST
-              value: api
             - name: DB_HOST
               value: postgres
             - name: DB_PASSWORD
               value: o2ims123
-            - name: FLASK_APP
-              value: /root/o2/o2app/entrypoints/flask_application.py
-            - name: FLASK_DEBUG
-              value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
               value: {{ .Values.o2ims.logginglevel }}
             - name: OS_AUTH_URL
+              value: {{ .Values.ocloud.OS_AUTH_URL }}
             - name: OS_PASSWORD
+              value: {{ .Values.ocloud.OS_PASSWORD }}
             - name: OS_USERNAME
+              value: {{ .Values.ocloud.OS_USERNAME }}
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
-            - name: PYTHONUNBUFFERED
-              value: "1"
             - name: REDIS_HOST
               value: redis
-          command: ["/bin/bash", "/opt/o2api_start.sh"]
+            - name: K8S_KUBECONFIG
+              value: {{ .Values.ocloud.K8S_KUBECONFIG }}
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: redis
-          image: redis:alpine
-          ports:
-            - containerPort: 6379
         - name: watcher
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
           command: ["/bin/bash", "/opt/o2watcher_start.sh"]
           env:
+            - name: API_HOST_EXTERNAL_FLOATING
+              value: {{ .Values.ocloud.API_HOST_EXTERNAL_FLOATING }}
             - name: DB_HOST
               value: postgres
             - name: DB_PASSWORD
@@ -107,26 +104,33 @@ spec:
           volumeMounts:
             - name: scripts
               mountPath: /opt
-        - name: o2pubsub
+        - name: o2api
           image: "{{ .Values.o2ims.image.repository }}:{{ .Values.o2ims.image.tag }}"
-          command: ["/bin/bash", "/opt/o2pubsub_start.sh"]
+          ports:
+            - containerPort: 80
           env:
+            - name: API_HOST
+              value: api
             - name: DB_HOST
               value: postgres
             - name: DB_PASSWORD
               value: o2ims123
+            - name: FLASK_APP
+              value: /root/o2/o2app/entrypoints/flask_application.py
+            - name: FLASK_DEBUG
+              value: {{ .Values.o2ims.logginglevel }}
             - name: LOGGING_CONFIG_LEVEL
               value: {{ .Values.o2ims.logginglevel }}
             - name: OS_AUTH_URL
-              value: {{ .Values.ocloud.OS_AUTH_URL }}
             - name: OS_PASSWORD
-              value: {{ .Values.ocloud.OS_PASSWORD }}
             - name: OS_USERNAME
-              value: {{ .Values.ocloud.OS_USERNAME }}
             - name: PYTHONDONTWRITEBYTECODE
               value: "1"
+            - name: PYTHONUNBUFFERED
+              value: "1"
             - name: REDIS_HOST
               value: redis
+          command: ["/bin/bash", "/opt/o2api_start.sh"]
           volumeMounts:
             - name: scripts
               mountPath: /opt