[stickynotes-antispam] Adapt template to script changes



commit dbaa52a4357385b9135adca5e603580c531db7e7
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Sep 30 19:19:54 2019 +0200

    Adapt template to script changes

 oscp.yml | 55 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/oscp.yml b/oscp.yml
index 8009b6d..76b2ac6 100644
--- a/oscp.yml
+++ b/oscp.yml
@@ -22,18 +22,22 @@ parameters:
   displayName: Version of pastespam
   name: IS_VERSION
   value: latest
-- description: URL of Sticky Notes instance
-  displayName: Sticky Notes URL
-  name: STICKYNOTES_URL
+- description: Database hostname of Sticky Notes
+  displayName: Database hostname
+  name: STICKYNOTES_DB_HOSTNAME
   required: true
-- description: Username of Sticky Notes admin user.
-  displayName: Sticky Notes admin username
-  name: STICKYNOTES_USERNAME
+- description: Username to connect to Sticky Notes database
+  displayName: Database username
+  name: STICKYNOTES_DB_USERNAME
   required: true
-- description: Password for the Sticky Motes admin user.
-  displayName: Sticky Notes admin password
-  name: STICKYNOTES_PASSWORD
+- description: Password for the database user
+  displayName: Database password
+  name: STICKYNOTES_DB_PASSWORD
   required: true
+- description: Database used by Sticky Notes
+  displayName: Database name
+  name: STICKYNOTES_DB_NAME
+  value: paste
 objects:
 - kind: Secret
   apiVersion: v1
@@ -42,14 +46,16 @@ objects:
     labels:
       app: "pastespam"
     annotations:
-      description: Sticky Notes credentials
-      template.openshift.io/expose-url: "{.data['stickynotes-url']}"
-      template.openshift.io/expose-username: "{.data['stickynotes-username']}"
-      template.openshift.io/expose-password: "{.data['stickynotes-password']}"
+      description: Sticky Notes database credentials
+      template.openshift.io/expose-host: "{.data['stickynotes-dbhost']}"
+      template.openshift.io/expose-username: "{.data['stickynotes-dbuser']}"
+      template.openshift.io/expose-password: "{.data['stickynotes-dbpass']}"
+      template.openshift.io/expose-dbname: "{.data['stickynotes-dbname']}"
   stringData:
-    stickynotes-url: "${STICKYNOTES_URL}"
-    stickynotes-username: "${STICKYNOTES_USERNAME}"
-    stickynotes-password: "${STICKYNOTES_PASSWORD}"
+    stickynotes-dbhost: "${STICKYNOTES_DB_HOSTNAME}"
+    stickynotes-dbuser: "${STICKYNOTES_DB_USERNAME}"
+    stickynotes-dbpass: "${STICKYNOTES_DB_PASSWORD}"
+    stickynotes-dbname: "${STICKYNOTES_DB_NAME}"
 - apiVersion: build.openshift.io/v1
   kind: "BuildConfig"
   metadata:
@@ -101,18 +107,23 @@ objects:
               image: docker-registry.default.svc:5000/pastespam/pastespam:latest
             restartPolicy: Never
             env:
-            - name: STICKYNOTES_URL
+            - name: STICKYNOTES_DB_HOSTNAME
               valueFrom:
                 secretKeyRef:
                   name: pastespam
-                  key: stickynotes-url
-            - name: STICKYNOTES_USERNAME
+                  key: stickynotes-dbhost
+            - name: STICKYNOTES_DB_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: pastespam
-                  key: stickynotes-username
-            - name: STICKYNOTES_PASSWORD
+                  key: stickynotes-dbuser
+            - name: STICKYNOTES_DB_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: pastespam
-                  key: stickynotes-password
+                  key: stickynotes-dbpass
+            - name: STICKYNOTES_DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: pastespam
+                  key: stickynotes-dbname


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]