From: Mike Elliott Date: Thu, 7 Jun 2018 13:22:07 +0000 (+0000) Subject: Merge "Fix AAF CS startup timeouts" X-Git-Tag: 2.0.0-ONAP~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b935e1ae32e188348a66674b73e78955ac5ed709;hp=0b0a3d678e5a5591d1198b82f1f1c6e7f17efb7b;p=oom.git 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 f40a7556da..ac1dece85c 100644 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 index f40a7556da..0000000000 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 d52c3c0321..ba0475988d 100644 --- 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