scottk/wlan-cloud-helm
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-helm.git synced 2025-11-02 11:37:45 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

replace hardcoded PSQL references (#35)

Browse Source
This commit is contained in:
Max
2020-12-22 17:43:53 +01:00
committed by GitHub
parent 786fb43652
commit 2550ed3ec2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tip-wlan/charts/wlan-integrated-cloud-component-service/templates/deployment.yaml
View File

@@ -59,7 +59,7 @@ spec:
echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****" echo "***** Fetching cloud-sdk-schema-postgresql.sql from JFrog *****"
curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql" curl -u$SCHEMA_REPO_USER:$SCHEMA_REPO_PASSWORD -O "https://tip-tip-wlan-cloud-docker-repo.jfrog.io/artifactory/tip-wlan-cloud-schemas/0.0.1-SNAPSHOT/sql/cloud-sdk-schema-postgresql.sql"
echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****" echo "***** Now executing cloud-sdk-schema-postgresql.sql and creating/updating schema on Postgres instance *****"
PGPASSWORD=$POSTGRES_PASSWORD psql -h tip-wlan-postgresql-headless -U postgres -f cloud-sdk-schema-postgresql.sql PGPASSWORD=$POSTGRES_PASSWORD psql -h {{- include "postgresql.service" . -}} -U postgres -f cloud-sdk-schema-postgresql.sql
exit exit
ports: ports:
- containerPort: 5432 - containerPort: 5432

2
tip-wlan/charts/wlan-prov-service/templates/configmap.yaml
View File

@@ -6,7 +6,7 @@ metadata:
data: data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
datasource.properties: |- datasource.properties: |-
singleDataSource.url=jdbc:postgresql://tip-wlan-postgresql:5432/prov_db singleDataSource.url=jdbc:postgresql://{{- include "postgresql.service" . -}}:5432/prov_db
singleDataSource.username={{ .Values.creds.postgres.singleDataSourceUsername }} singleDataSource.username={{ .Values.creds.postgres.singleDataSourceUsername }}
singleDataSource.password={{ .Values.creds.postgres.singleDataSourcePassword }} singleDataSource.password={{ .Values.creds.postgres.singleDataSourcePassword }}
singleDataSource.driverClass=org.postgresql.Driver singleDataSource.driverClass=org.postgresql.Driver