From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 7 Jan 2022 16:17:31 +0000 (+0000)
Subject: [CONTRIB] Fix for re-execution error of the ejbca configuration
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=c35704c38eff68fdfad6aaa85ca486f283f49e7b

[CONTRIB] Fix for re-execution error of the ejbca configuration

If ejbca gets restarted, the config script should return 0,
although addrolemember as last command returns an error,
as the entry already exists

Issue-ID: OOM-2904

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: If27fe92e41b5fc7fc91f0298bea87fb0d566fed2
(cherry picked from commit cddb5ebdc5c738085a04ccef154e3dc9f43472b0)
---

diff --git a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
index 94c95d6c30..a538238151 100755
--- a/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
+++ b/kubernetes/contrib/components/ejbca/resources/ejbca-config.sh
@@ -49,6 +49,8 @@ configureEjbca() {
     ejbca.sh roles changerule "Certificate Update Admin" /endentityprofilesrules/Custom_EndEntity/ ACCEPT
     ejbca.sh roles changerule "Certificate Update Admin" /ra_functionality/edit_end_entity/ ACCEPT
     ejbca.sh roles addrolemember "Certificate Update Admin" ManagementCA WITH_ORGANIZATION --value "{{ .Values.cmpv2Config.global.certificate.default.subject.organization }}"
+    # workarround to exit successfully, as a reexecution of "addrolemember" returns an error
+    exit 0
 }