Merge pull request sclorg#74 from bparees/template

bparees · web-flow · commit 6ddac81c67c3 · 2017-01-17T14:06:18.000-05:00
fix invalid key names
diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
@@ -22,8 +22,8 @@
         "name": "${NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${DATABASE_USER}",
-        "databasePassword" : "${DATABASE_PASSWORD}"
+        "database-user" : "${DATABASE_USER}",
+        "database-password" : "${DATABASE_PASSWORD}"
       }
     },
     {
@@ -218,7 +218,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -227,7 +227,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -338,7 +338,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -347,7 +347,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`"name": "${NAME}"`
`23`	`23`	`},`
`24`	`24`	`"stringData" : {`
`25`		`- "databaseUser" : "${DATABASE_USER}",`
`26`		`- "databasePassword" : "${DATABASE_PASSWORD}"`
	`25`	`+ "database-user" : "${DATABASE_USER}",`
	`26`	`+ "database-password" : "${DATABASE_PASSWORD}"`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`{`
`@@ -218,7 +218,7 @@`
`218`	`218`	`"valueFrom": {`
`219`	`219`	`"secretKeyRef" : {`
`220`	`220`	`"name" : "${NAME}",`
`221`		`- "key" : "databaseUser"`
	`221`	`+ "key" : "database-user"`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`},`
`@@ -227,7 +227,7 @@`
`227`	`227`	`"valueFrom": {`
`228`	`228`	`"secretKeyRef" : {`
`229`	`229`	`"name" : "${NAME}",`
`230`		`- "key" : "databasePassword"`
	`230`	`+ "key" : "database-password"`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`	`},`
`@@ -338,7 +338,7 @@`
`338`	`338`	`"valueFrom": {`
`339`	`339`	`"secretKeyRef" : {`
`340`	`340`	`"name" : "${NAME}",`
`341`		`- "key" : "databaseUser"`
	`341`	`+ "key" : "database-user"`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`	`},`
`@@ -347,7 +347,7 @@`
`347`	`347`	`"valueFrom": {`
`348`	`348`	`"secretKeyRef" : {`
`349`	`349`	`"name" : "${NAME}",`
`350`		`- "key" : "databasePassword"`
	`350`	`+ "key" : "database-password"`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`	`},`