diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml index 6e584110d..99e83ab7b 100644 --- a/backend/openshift.deploy.yml +++ b/backend/openshift.deploy.yml @@ -177,15 +177,21 @@ objects: containers: - name: ${REPO}-${ZONE}-${COMPONENT}-app image: 'ghcr.io/bcgov/${REPO}/${COMPONENT}:${TAG}' - volumeMounts: - - name: staticfiles - mountPath: /app/staticfiles + # volumeMounts: + # - name: staticfiles + # mountPath: /app/staticfiles ports: - containerPort: 8080 protocol: TCP env: - name: DATABASE_SERVICE_NAME value: ${REPO}-${ZONE}-database + - name: PG_PRIMARY_HOST + value: ${REPO}-${ZONE}-database + - name: PG_PRIMARY_PORT + value: "5432" + - name: PGHOST + value: /tmp - name: DATABASE_NAME valueFrom: secretKeyRef: @@ -401,13 +407,13 @@ objects: key: SSO_IDP_HINT name: ${REPO}-${ZONE}-global-config - name: CUSTOM_GDAL_GEOS - value: 'False' + value: 'false' - name: WEB_CONCURRENCY value: '4' - name: GUNICORN_WORKERS value: '4' - name: ENFORCE_ENV_VARIABLES - value: 'False' + value: 'false' - name: EMAIL_NOTIFICATION_RECIPIENT valueFrom: configMapKeyRef: diff --git a/common/openshift.init.yml b/common/openshift.init.yml index 7aa63b546..05da2c683 100644 --- a/common/openshift.init.yml +++ b/common/openshift.init.yml @@ -7,11 +7,11 @@ parameters: - name: ZONE description: Deployment zone, e.g. pr-### or prod required: true - # - description: The name of the OpenShift Service exposed for the database. - # displayName: Database Service Name - # name: DATABASE_SERVICE_NAME - # required: true - # value: postgresql + - description: The name of the OpenShift Service exposed for the database. + displayName: Database Service Name + name: DATABASE_SERVICE_NAME + required: true + value: postgresql - description: Username for PostgreSQL user that will be used for accessing the database. name: POSTGRESQL_USER required: true @@ -69,6 +69,7 @@ objects: database-name: ${POSTGRESQL_DATABASE} database-password: ${POSTGRESQL_PASSWORD} database-user: ${POSTGRESQL_USER} + database-host: postgresql fdw-database-user: proxy_wells_gwells fdw-database-password: ${FDW_DATABASE_PASSWORD} fdw-database-server: "//nrk1-scan.bcgov/envprod1.nrs.bcgov"