Merge "Fix AAF CS startup timeouts"

diff --git a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12
index f40a755..ac1dece 100644 (file)
Binary files a/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 and b/kubernetes/aaf/resources/config/local/org.osaaf.aaf.p12 differ

diff --git a/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12 b/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12
deleted file mode 100644 (file)
index f40a755..0000000
Binary files a/kubernetes/aaf/resources/config/local/org.osaaf.aaf_new-24e41f2f436018568cbdecdc1edbd605.p12 and /dev/null differ

diff --git a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
index d52c3c0..ba04759 100644 (file)
--- a/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
+++ b/kubernetes/oof/charts/oof-has/charts/oof-has-music/values.yaml
@@ -30,7 +30,7 @@ global:
 repository: nexus3.onap.org:10001
 image: library/tomcat:8.5
 pullPolicy: Always
-warImage: onap/music/music:latest
+warImage: onap/music/music:2.5.3
 
 # flag to enable debugging - application support required
 debugEnabled: false