summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-02-24 23:06:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-24 23:06:45 +0000
commita786ac5c071fe3733075d92fc6b31c66905d6d4e (patch)
treed26c80e7036c0904c4c7c9537306474dd65cdeae
parent090c37f5e68ffabcdd40b7956a4ae862804b6080 (diff)
parent48fe2196e8f7681a804bc6bc122f3aae70d318e2 (diff)
Merge changes I52c33d1d,I162e4119
* changes: Update fProxy keystore Update Babel image to latest STAGING
-rw-r--r--kubernetes/aai/charts/aai-babel/values.yaml2
-rw-r--r--kubernetes/aai/resources/config/fproxy/auth/tomcat_keystorebin2214 -> 3607 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/kubernetes/aai/charts/aai-babel/values.yaml b/kubernetes/aai/charts/aai-babel/values.yaml
index 8c192e531e..8e5aa2daa8 100644
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@ -25,7 +25,7 @@ global:
#################################################################
# application image
-image: onap/babel:1.3.2
+image: onap/babel:1.4-STAGING-latest
flavor: small
diff --git a/kubernetes/aai/resources/config/fproxy/auth/tomcat_keystore b/kubernetes/aai/resources/config/fproxy/auth/tomcat_keystore
index 9eec841aa2..d68bf73815 100644
--- a/kubernetes/aai/resources/config/fproxy/auth/tomcat_keystore
+++ b/kubernetes/aai/resources/config/fproxy/auth/tomcat_keystore
Binary files differ