X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fvalues.yaml;h=0cd7ae315db981b958b22b02a31d77e5c7eacae9;hb=47b1b82fdabe343c6c2b2d076e3b76d9ffee0314;hp=b29f8a2b137722a05808940d8fe4dcea4511960a;hpb=b69313bdf730f1edb654e5a048a6b9e78a0cc5cc;p=oom.git

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index b29f8a2b13..0cd7ae315d 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +19,6 @@
 global: # global defaults
   nodePortPrefix: 302
   repository: nexus3.onap.org:10001
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   dockerhubRepository: docker.io
   busyboxImage: busybox
   readinessRepository: oomk8s
@@ -30,15 +30,13 @@ global: # global defaults
     serviceName: aai-cassandra
     replicas: 3
   aai:
-    serviceName: aai-aai
+    serviceName: aai
   babel:
     serviceName: aai-babel
   champ:
     serviceName: aai-champ
   aaiElasticsearch:
     serviceName: aai-elasticsearch
-  hbase:
-    serviceName: aai-hbase
   resources:
     serviceName: aai-resources
   sparkyBe:
@@ -57,7 +55,7 @@ global: # global defaults
 
 # application image
 dockerhubRepository: registry.hub.docker.com
-image: aaionap/haproxy:1.2.1
+image: aaionap/haproxy:1.2.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -65,9 +63,6 @@ debugEnabled: false
 
 # application configuration
 config:
-  # POLICY hotfix - Note this must be temporary
-  # See https://jira.onap.org/browse/POLICY-510
-  aaiServiceClusterIp:
   logstashServiceName: log-ls
   logstashPort: 5044
 
@@ -92,13 +87,17 @@ readiness:
 
 service:
   type: NodePort
-  name: aai
+  portName: aai
   externalPort: 8080
   internalPort: 8080
   nodePort: 32
+  portName2: aai-ssl
   externalPort2: 8443
   internalPort2: 8443
   nodePort2: 33
+  # POLICY hotfix - Note this must be temporary
+  # See https://jira.onap.org/browse/POLICY-510
+  aaiServiceClusterIp:
 
 ingress:
   enabled: false