From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Thu, 15 Oct 2020 09:46:44 +0000 (+0000)
Subject: Merge "[CONTRIB] Fix EJBCA configuration"
X-Git-Tag: 7.0.0~129
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=eb33439940d480133c059a71f3e91becd9598136;hp=235e94743fb3085aea771c0e6eed9955d759cc2e;p=oom.git

Merge "[CONTRIB] Fix EJBCA configuration"
---

diff --git a/kubernetes/aai b/kubernetes/aai
index 628ecd0d51..fa694e0feb 160000
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit 628ecd0d519acc6b4717d05aa12fd4f7b7dfc55f
+Subproject commit fa694e0feb325333cfffb7d7852aa97264f96b6c
diff --git a/kubernetes/common/cassandra/templates/backup/cronjob.yaml b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
index 1d1e4594da..cabe59f696 100644
--- a/kubernetes/common/cassandra/templates/backup/cronjob.yaml
+++ b/kubernetes/common/cassandra/templates/backup/cronjob.yaml
@@ -59,7 +59,7 @@ spec:
                   curr_time=$1
                   echo "Clearing snapshots!!!"
                   command="nodetool clearsnapshot -t $curr_time"
-                  /app/exec.py -p "cassandra" -c "$command"
+                  /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 }
                 {{ $root := . }}
                 curr_time=`date +%s`
@@ -75,11 +75,11 @@ spec:
 
                 echo "Executing cleanup!!"
                 command="nodetool cleanup"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 echo "Cleaned Node!! Backing up database now!!!"
 
                 command="nodetool snapshot -t $curr_time"
-                /app/exec.py -p "cassandra" -c "$command"
+                /app/exec.py -p "{{ include "common.name" . }}" -c "$command"
                 retCode=$?
                 if [ $retCode -ne 0 ]; then
                   echo "Backup Failed!!!"
diff --git a/kubernetes/common/common/templates/_name.tpl b/kubernetes/common/common/templates/_name.tpl
index adbe2b6cf9..793fb3e07b 100644
--- a/kubernetes/common/common/templates/_name.tpl
+++ b/kubernetes/common/common/templates/_name.tpl
@@ -53,7 +53,7 @@
   {{- $name := default $dot.Chart.Name $dot.Values.nameOverride -}}
   {{/* when linted, the name must be lower cased. When used from a component,
        name should be overriden in order to avoid collision so no need to do it */}}
-  {{- if eq (printf "common/%s/templates" $name) $dot.Template.BasePath -}}
+  {{- if eq (printf "%s/templates" $name) $dot.Template.BasePath -}}
   {{- $name = lower $name -}}
   {{- end -}}
   {{- include "common.fullnameExplicit" (dict "dot" $dot "chartName" $name "suffix" $suffix) }}
diff --git a/kubernetes/robot b/kubernetes/robot
index 34913f2223..da28d1cdc5 160000
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit 34913f2223539640c81ae9e7a65744a09a95c9ce
+Subproject commit da28d1cdc573a726d3fc8a19638ebc8b3679295f