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>

1 files changed, 25 insertions, 3 deletions

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 3c6894c638..c0715382e6 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -2,6 +2,28 @@ nsPrefix: onap
 pullPolicy: Always
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  ajscAai: nexus3.onap.org:10001/openecomp/ajsc-aai:1.0-STAGING-latest
-  aaiHbase: aaidocker/aai-hbase-1.2.3:latest
-  modelLoader: nexus3.onap.org:10001/openecomp/model-loader:1.0-STAGING-latest
+  aaiProxy: aaionap/haproxy
+  aaiProxyVersion: latest
+  aaiHbaseImage: harisekhon/hbase
+  aaiHbaseVersion: latest
+  modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
+  modelLoaderVersion: 1.1-STAGING-latest
+  dmaapImage: attos/dmaap
+  dmaapVersion: latest
+  aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
+  aaiResourcesVersion: 1.1-STAGING-latest
+  aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
+  aaiTraversalVersion: 1.1-STAGING-latest
+  aaiZookeeperImage: wurstmeister/zookeeper
+  aaiZookeeperVersion: latest
+  dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
+  dataRouterVersion: 1.1-STAGING-latest
+  elasticsearchImage: elasticsearch
+  elasticsearchVersion: 2.4.1
+  searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service
+  searchDataVersion: 1.1-STAGING-latest
+  sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
+  sparkyBeVersion: 1.1-STAGING-latest
+  gremlinServerImage: aaionap/gremlin-server
+  kafkaImage: wurstmeister/kafka
+  kafkaVersion: latest
\ No newline at end of file