NO-ISSUE Using centos postgres except for UT (openshift#560)

rollandf · Oct 15, 2020 · 2099ea3 · 2099ea3
1 parent b5cea76
commit 2099ea3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -237,7 +237,7 @@ deploy-test: _verify_minikube generate-keys
 
 deploy-onprem:
 	podman pod create --name assisted-installer -p 5432,8000,8090,8080
-	podman run -dt --pod assisted-installer --env-file onprem-environment --name db quay.io/ocpmetal/postgres:12.3-alpine
+	podman run -dt --pod assisted-installer --env-file onprem-environment --name db quay.io/ocpmetal/postgresql-12-centos7
 	podman run -dt --pod assisted-installer --env-file onprem-environment --pull always -v $(PWD)/deploy/ui/nginx.conf:/opt/bitnami/nginx/conf/server_blocks/nginx.conf:z --name ui quay.io/ocpmetal/ocp-metal-ui:latest
 	podman run -dt --pod assisted-installer --env-file onprem-environment --env DUMMY_IGNITION=$(DUMMY_IGNITION) --user assisted-installer  --restart always --name installer $(SERVICE_ONPREM)
 

diff --git a/config/onprem-iso-config.ign b/config/onprem-iso-config.ign
@@ -76,7 +76,7 @@
         "name": "assisted-service-pod.service"
       },
       {
-        "contents": "[Unit]\nAfter=assisted-service-pod.service\n\n[Service]\nType=forking\nRestart=no\nExecStart=podman run -dt --pod assisted-installer --env-file /etc/assisted-service/environment --authfile /etc/assisted-service/auth.json --name db quay.io/ocpmetal/postgres:12.3-alpine\nTimeoutStartSec=300\n\n[Install]\nWantedBy=multi-user.target\n",
+        "contents": "[Unit]\nAfter=assisted-service-pod.service\n\n[Service]\nType=forking\nRestart=no\nExecStart=podman run -dt --pod assisted-installer --env-file /etc/assisted-service/environment --authfile /etc/assisted-service/auth.json --name db quay.io/ocpmetal/postgresql-12-centos7\nTimeoutStartSec=300\n\n[Install]\nWantedBy=multi-user.target\n",
         "enabled": true,
         "name": "assisted-service-db.service"
       },

diff --git a/config/onprem-iso-fcc.yaml b/config/onprem-iso-fcc.yaml
@@ -56,7 +56,7 @@ systemd:
             [Service]
             Type=forking
             Restart=no
-            ExecStart=podman run -dt --pod assisted-installer --env-file /etc/assisted-service/environment --authfile /etc/assisted-service/auth.json --name db quay.io/ocpmetal/postgres:12.3-alpine
+            ExecStart=podman run -dt --pod assisted-installer --env-file /etc/assisted-service/environment --authfile /etc/assisted-service/auth.json --name db quay.io/ocpmetal/postgresql-12-centos7
             TimeoutStartSec=300
           
             [Install]
@@ -103,9 +103,9 @@ storage:
           mode: 0644
           contents:
             inline: |
-                POSTGRES_DB=installer
-                POSTGRES_PASSWORD=admin
-                POSTGRES_USER=admin
+                POSTGRESQL_DATABASE=installer
+                POSTGRESQL_PASSWORD=admin
+                POSTGRESQL_USER=admin
                 DB_HOST=127.0.0.1
                 DB_PORT=5432
                 DB_USER=admin

diff --git a/deploy/postgres/postgres-deployment.yaml b/deploy/postgres/postgres-deployment.yaml
@@ -15,22 +15,22 @@ spec:
     spec:
       containers:
         - name: postgres
-          image: quay.io/ocpmetal/postgres:12.3-alpine
+          image: quay.io/ocpmetal/postgresql-12-centos7
           imagePullPolicy: "IfNotPresent"
           ports:
             - containerPort: 5432
           env:
-            - name: POSTGRES_DB
+            - name: POSTGRESQL_DATABASE
               valueFrom:
                 secretKeyRef:
                   name: assisted-installer-rds
                   key: db.name
-            - name: POSTGRES_USER
+            - name: POSTGRESQL_USER
               valueFrom:
                 secretKeyRef:
                   name: assisted-installer-rds
                   key: db.user
-            - name: POSTGRES_PASSWORD
+            - name: POSTGRESQL_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: assisted-installer-rds

diff --git a/onprem-environment b/onprem-environment
@@ -1,6 +1,6 @@
-POSTGRES_DB=installer
-POSTGRES_PASSWORD=admin
-POSTGRES_USER=admin
+POSTGRESQL_DATABASE=installer
+POSTGRESQL_PASSWORD=admin
+POSTGRESQL_USER=admin
 DB_HOST=127.0.0.1
 DB_PORT=5432
 DB_USER=admin