[WIP] Add new AAI configuration files

[oom.git] / kubernetes / aai / data-router-deployment.yaml

diff --git a/kubernetes/aai/data-router-deployment.yaml b/kubernetes/aai/data-router-deployment.yaml
index 6a55305..6ede270 100644 (file)
--- a/kubernetes/aai/data-router-deployment.yaml
+++ b/kubernetes/aai/data-router-deployment.yaml
@@ -13,7 +13,9 @@ spec:
       name: data-router
     spec:
       containers:
-      - env:
+      - name: data-router
+        image: nexus3.onap.org:10001/openecomp/data-router:1.1-STAGING-latest
+        env:
         - name: SERVICE_BEANS
           value: /opt/app/data-router/dynamic/conf
         - name: CONFIG_HOME
@@ -28,8 +30,6 @@ spec:
           value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
         - name: JAVA_HOME
           value: usr/lib/jvm/java-8-openjdk-amd64
-        image: nexus3.onap.org:10001/openecomp/data-router:1.1-STAGING-latest
-        name: data-router
         volumeMounts:
         - mountPath: /opt/app/data-router/config/
           name: data-router-config
@@ -37,16 +37,6 @@ spec:
           name: data-router-dynamic
         - mountPath: /logs/
           name: data-router-logs
-      volumes:
-        - name: data-router-config
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/config/
-        - name: data-router-dynamic
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/dynamic/
-        - name: data-router-logs
-          hostPath:
-            path: /dockerdata/onapdemo/aai/data-router/logs/
         ports:
         - containerPort: 9502
         readinessProbe:
@@ -54,6 +44,16 @@ spec:
             port: 8080
           initialDelaySeconds: 5
           periodSeconds: 10
+      volumes:
+      - name: data-router-config
+        hostPath:
+          path: /dockerdata/onapdemo/aai/data-router/appconfig/
+      - name: data-router-dynamic
+        hostPath:
+          path: /dockerdata/onapdemo/aai/data-router/dynamic/
+      - name: data-router-logs
+        hostPath:
+          path: /dockerdata/onapdemo/aai/data-router/logs/
       restartPolicy: Always
       imagePullSecrets:
       - name: onap-docker-registry-key