From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Mon, 2 Oct 2017 13:33:12 +0000 (+0000)
Subject: Merge "SNIRO Emulator - Adding SNIRO emulator container"
X-Git-Tag: 2.0.0-ONAP~618
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b9644b17f8545dedd3ede40f778b33f9b4ecf480;hp=2065d737ff76fd0653ddc5430f866fea7de91022;p=oom.git

Merge "SNIRO Emulator - Adding SNIRO emulator container"
---

diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml
index c874e39995..6c78ca8798 100644
--- 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 d430479664..a56608009a 100644
--- 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 1504b4021e..9c549c781b 100644
--- 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
diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index dde9ca102d..785ebb6248 100644
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB
-HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'kube2msb' 'aaf')
+HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'kube2msb' 'aaf' 'vfc')
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
 ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}