Merge "Drop the submodule nexus-repository-helm"

[it/dep.git] / ric-xapps / 90-xApps / helm / xapp-std / templates / appconfig.yaml

diff --git a/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml b/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml
index ce0dc0a..ab8c294 100644 (file)
--- a/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml
+++ b/ric-xapps/90-xApps/helm/xapp-std/templates/appconfig.yaml
@@ -13,13 +13,20 @@
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
 #   See the License for the specific language governing permissions and        #
 #   limitations under the License.                                             #
-################################################################################
+################################################################################'
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-appconfig
+  name: {{ include "ricxapp.configmapname" . }}-appconfig
 data:
-  {{- with .Values.ricapp.appconfig }}
-    {{- toYaml . | nindent 2 }}
-  {{- end }}
+{{- $dbaasservice := .Values.ricplt.dbaasService | quote -}}
+{{- $pltingressurl := .Values.ricplt.pltIngressUrl | quote -}}
+{{- $xappingressurl := .Values.ricplt.xappIngressUrl | quote -}}
+{{- $appmgrrmrservice := .Values.ricplt.appmgrRMRService | quote -}}
+{{- $e2mgrrmrservice := .Values.ricplt.e2mgrRMRService | quote -}}
+{{- $e2termrmrservice := .Values.ricplt.e2termRMRService | quote -}}
+{{- $rtmgrrmrservice := .Values.ricplt.rtmgrRMRService | quote -}}
+{{- $a1mediatorrmrservice := .Values.ricplt.a1mediatorRMRService | quote -}}
 
+{{- (.Files.Glob "config/*").AsConfig | replace "__DBAAS_SERVICE__" $dbaasservice | replace "__PLT_INGRESS_URL__" $pltingressurl | replace "__XAPP_INGRESS_URL__" $xappingressurl | replace "__APPMGR_RMR_SERVICE__" $appmgrrmrservice | replace "__E2MGR_RMR_SERVICE__" $e2mgrrmrservice | replace "__E2TERM_RMR_SERVICE__" $e2termrmrservice | replace "__RTMGR_RMR_SERVICE__" $rtmgrrmrservice | replace "__A1MEDIATOR_RMR_SERVICE__" $a1mediatorrmrservice | nindent 2 }}