From dbd77f6aeba97f5d068dc55533dc2c06dc4f6f7c Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Sat, 23 Sep 2017 03:08:09 +0000 Subject: [PATCH] Update the resources deployment and traversal Remove the aai-config and aai-data to be mounted Change the docker hbase to use aaionap/hbase Also change the mount path for logs to be proper Issue-ID: AAI-397 Change-Id: I4996d339a062143c2ef308413b7e3be6101f92fd Signed-off-by: Venkata Harish K Kajur --- templates/aai-resources-deployment.yaml | 4 +++- templates/aai-traversal-deployment.yaml | 4 +++- values.yaml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml index c874e39..6c78ca8 100644 --- a/templates/aai-resources-deployment.yaml +++ b/templates/aai-resources-deployment.yaml @@ -54,11 +54,13 @@ spec: value: /var/chef/aai-data/environments - name: CHEF_GIT_URL value: http://gerrit.onap.org/r/aai + - name: LOCAL_USER_ID + value: "0" volumeMounts: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/aai/logroot/ + - mountPath: /opt/aai/logroot/AAI-RES name: aai-resources-logs - mountPath: /var/chef/aai-data/ name: aai-data diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml index d430479..a566080 100644 --- a/templates/aai-traversal-deployment.yaml +++ b/templates/aai-traversal-deployment.yaml @@ -58,11 +58,13 @@ spec: value: http://gerrit.onap.org/r/aai - name: RESOURCES_HOSTNAME value: aai-resources.{{ .Values.nsPrefix }}-aai + - name: LOCAL_USER_ID + value: "0" volumeMounts: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /opt/aai/logroot/ + - mountPath: /opt/aai/logroot/AAI-GQ name: aai-traversal-logs - mountPath: /var/chef/aai-data/ name: aai-data diff --git a/values.yaml b/values.yaml index 1504b40..9c549c7 100644 --- a/values.yaml +++ b/values.yaml @@ -5,8 +5,8 @@ image: readiness: oomk8s/readiness-check:1.0.0 aaiProxy: aaionap/haproxy aaiProxyVersion: latest - aaiHbaseImage: harisekhon/hbase - aaiHbaseVersion: latest + aaiHbaseImage: aaionap/hbase + aaiHbaseVersion: 1.2.0 modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader modelLoaderVersion: 1.1-STAGING-latest aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources -- 2.16.6