From 0de302ad6212185c842ce7232319e19d994dd520 Mon Sep 17 00:00:00 2001
From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 5 Jun 2020 15:19:22 +0200
Subject: [AAF SMS] Use certInitializer for certificates

AAF SMS was hardcoding its certificates in the container.
This patch makes use of certInitializer in order to retrieve "fresh"
certificates.
In order to use certInitiliazer in a sub component, we had to move
charts to component and add the right requirements.

Issue-ID: AAF-1159
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I6ec55eddffd54dd56b03cea1a6f0b437f8bfa299
---
 .../aaf/charts/aaf-sms/resources/config/has.json   |  44 ---------
 .../aaf/charts/aaf-sms/resources/config/osdf.json  | 105 ---------------------
 2 files changed, 149 deletions(-)
 delete mode 100644 kubernetes/aaf/charts/aaf-sms/resources/config/has.json
 delete mode 100644 kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json

(limited to 'kubernetes/aaf/charts/aaf-sms/resources/config')

diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/has.json b/kubernetes/aaf/charts/aaf-sms/resources/config/has.json
deleted file mode 100644
index 679b5189de..0000000000
--- a/kubernetes/aaf/charts/aaf-sms/resources/config/has.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "domain": {
-        "name": "has",
-        "secrets": [
-            {
-                "name": "aai",
-                "values": {
-                    "username": "${AAI_USER}",
-                    "password": "${AAI_PASS}"
-                }
-            },
-            {
-                "name": "conductor_api",
-                "values": {
-                    "username": "${CONDUCTOR_USER}",
-                    "password": "${CONDUCTOR_PASS}"
-                }
-            },
-            {
-                "name": "sdnc",
-                "values": {
-                    "username": "${SDNC_USER}",
-                    "password": "${SDNC_PASS}"
-                }
-            },
-            {
-                "name": "music_api",
-                "values": {
-                    "aafuser": "${MUSIC_USER}",
-                    "aafpass": "${MUSIC_PASS}",
-                    "aafns": "conductor"
-                }
-            },
-            {
-                "name": "aaf_api",
-                "values": {
-                    "username": "${AAF_USER}",
-                    "password": "${AAF_PASS}",
-                    "aaf_conductor_user": "oof@oof.onap.org"
-                }
-            }
-        ]
-    }
-}
diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
deleted file mode 100644
index add0808701..0000000000
--- a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "domain": {
-        "name": "osdf",
-        "secrets": [
-            {
-                "name": "so",
-                "values": {
-                    "UserName": "${SO_USER}",
-                    "Password": "${SO_PASS}"
-                }
-            },
-            {
-                "name": "conductor",
-                "values": {
-                    "UserName": "${CONDUCTOR_USER}",
-                    "Password": "${CONDUCTOR_PASS}"
-                }
-            },
-            {
-                "name": "policyPlatform",
-                "values": {
-                    "UserName": "${POLICY_PLAT_USER}",
-                    "Password": "${POLICY_PLAT_PASS}"
-                }
-            },
-            {
-                "name": "policyClient",
-                "values": {
-                    "UserName": "${POLICY_CLI_USER}",
-                    "Password": "${POLICY_CLI_PASS}"
-                }
-            },
-            {
-                "name": "dmaap",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "sdc",
-                "values": {
-                    "UserName": "NA",
-                    "Password": "NA"
-                }
-            },
-            {
-                "name": "osdfPlacement",
-                "values": {
-                    "UserName": "${OSDF_PLACEMENT_USER}",
-                    "Password": "${OSDF_PLACEMENT_PASS}"
-                }
-            },
-            {
-                "name": "osdfPlacementSO",
-                "values": {
-                    "UserName": "${OSDF_PLACEMENT_SO_USER}",
-                    "Password": "${OSDF_PLACEMENT_SO_PASS}"
-                }
-            },
-            {
-                "name": "osdfPlacementVFC",
-                "values": {
-                    "UserName": "${OSDF_PLACEMENT_VFC_USER}",
-                    "Password": "${OSDF_PLACEMENT_VFC_PASS}"
-                }
-            },
-            {
-                "name": "osdfCMScheduler",
-                "values": {
-                    "UserName": "${OSDF_CM_SCHEDULER_USER}",
-                    "Password": "${OSDF_CM_SCHEDULER_PASS}"
-                }
-            },
-            {
-                "name": "configDb",
-                "values": {
-                    "UserName": "${CONFIG_DB_USER}",
-                    "Password": "${CONFIG_DB_PASS}"
-                }
-            },
-            {
-                "name": "pciHMS",
-                "values": {
-                    "UserName": "",
-                    "Password": ""
-                }
-            },
-            {
-                "name": "osdfPCIOpt",
-                "values": {
-                    "UserName": "${OSDF_PCI_OPT_USER}",
-                    "Password": "${OSDF_PCI_OPT_PASS}"
-                }
-            },
-            {
-                "name": "osdfOptEngine",
-                "values": {
-                    "UserName": "${OSDF_OPT_ENGINE_USER}",
-                    "Password": "${OSDF_OPT_ENGINE_PASS}"
-                }
-            }
-        ]
-    }
-}
-- 
cgit 1.2.3-korg