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 <vk250x@att.com>

diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index c874e39..6c78ca8 100644 (file)
--- a/kubernetes/aai/templates/aai-resources-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index d430479..a566080 100644 (file)
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/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/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 1504b40..9c549c7 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/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