AAI 1.1 K8s templates and aelm branch merge
commit 8a32c4269a6d1dcdcdee6c2548043639754db936
Author: yuryn <Yury.Novitsky@Amdocs.com>
Date: Mon Aug 28 14:45:23 2017 +0300
Add dependencies to aai-deployment
1. Add to aai-deployment dependency in aai-resources and aai-traversal
2. Fix readiness ports for data-router and sparky-be
Change-Id: Icfcd4685ac3cad8e463b5f8176b28f51890d1e38
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
commit 34b6e617ca961b6a6df85e88daf122c7cd4195af
Author: yuryn <Yury.Novitsky@Amdocs.com>
Date: Sun Aug 27 20:25:29 2017 +0300
Add AAI haproxy
1. Add AAI haproxy
2. Create aai-resources and aai-traversal log dirs
Change-Id: Ib60cc7e482cafe2f1185db7bead181f929165ed3
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
commit 82417bcba69cc126a811605e7e577941c6c5eb2e
Author: yuryn <Yury.Novitsky@Amdocs.com>
Date: Thu Aug 24 14:08:30 2017 +0300
Fix aai-model-loader-logs
1. Create aai/model-loader/logs folder in config-init
2. Fix aai-model-loader-logs volume name
Change-Id: Ib66b8a226be9f5c42b06e6e7a239af081ad6d874
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
commit 441adcffd7041266378ae251f36592da5a44f2c2
Author: yuryn <Yury.Novitsky@Amdocs.com>
Date: Mon Aug 21 17:18:42 2017 +0300
[WIP] Add new AAI configuration files
Addressed review comments:
1. Use k8s lookup names for host names
2. Use existing /opt/data/hdfs-data-name folder
3. Remove redundant entries in yaml files
Change-Id: Ied5f559aebc89c9a22b3e5228e6625af86646b5f
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
commit 0473270da932e4bbf596007fd8fb7ec3cba4e1cc
Author: yuryn <Yury.Novitsky@amdocs.com>
Date: Sun Aug 20 18:48:51 2017 +0300
Add gremlin and ES services
Issue-ID: OOM-65
Change-Id: I3e879418a1258716db1633676cf66bb9620c2b5f
Signed-off-by: yuryn <Yury.Novitsky@amdocs.com>
commit 0b1332938385cc534b1f034b73f19c145ead87c6
Author: Munir Ahmad <munir.ahmad@bell.ca>
Date: Tue Aug 15 15:36:46 2017 -0400
onap 1.1 deployment files work in progress...
issue-id: OOM-66
Change-Id: If6553647343bb07464e8cc8556223f0c7a01f134
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Issue-ID: OOM-65
Change-Id: I4afc3d2457a27791ba72f959c82d791b50e02eb2
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Signed-off-by: Eric Au <kachun.au@amdocs.com>
Signed-off-by: ronakvy <ronak.vyas@amdocs.com>
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
new file mode 100644
index 0000000..f823061
--- /dev/null
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -0,0 +1,61 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: data-router
+ namespace: "{{ .Values.nsPrefix }}-aai"
+spec:
+ selector:
+ matchLabels:
+ app: data-router
+ template:
+ metadata:
+ labels:
+ app: data-router
+ name: data-router
+ spec:
+ containers:
+ - name: data-router
+ image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ env:
+ - name: SERVICE_BEANS
+ value: /opt/app/data-router/dynamic/conf
+ - name: CONFIG_HOME
+ value: /opt/app/data-router/config/
+ - name: KEY_STORE_PASSWORD
+ value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ - name: DYNAMIC_ROUTES
+ value: /opt/app/data-router/dynamic/routes
+ - name: KEY_MANAGER_PASSWORD
+ value: OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ - name: PATH
+ value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ - name: JAVA_HOME
+ value: usr/lib/jvm/java-8-openjdk-amd64
+ volumeMounts:
+ - mountPath: /opt/app/data-router/config/
+ name: data-router-config
+ - mountPath: /opt/app/data-router/dynamic/
+ name: data-router-dynamic
+ - mountPath: /logs/
+ name: data-router-logs
+ ports:
+ - containerPort: 9502
+ readinessProbe:
+ tcpSocket:
+ port: 9502
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ volumes:
+ - name: data-router-config
+ hostPath:
+ path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/appconfig/"
+ - name: data-router-dynamic
+ hostPath:
+ path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/dynamic/"
+ - name: data-router-logs
+ hostPath:
+ path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs/"
+ restartPolicy: Always
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"