parameterize IS namespace

gabemontero · gabemontero · commit f371465cc2b8 · 2016-03-14T17:23:01.000-04:00
diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
@@ -82,7 +82,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "ImageStreamTag",
-              "namespace": "openshift",
+              "namespace": "${NAMESPACE}",
               "name": "python:3.4"
             }
           }
@@ -266,7 +266,7 @@
               ],
               "from": {
                 "kind": "ImageStreamTag",
-                "namespace": "openshift",
+                "namespace": "${NAMESPACE}",
                 "name": "postgresql:9.4"
               }
             }
@@ -344,6 +344,12 @@
       "required": true,
       "value": "django-psql-example"
     },
+    {
+      "name": "NAMESPACE",
+      "displayName": "Namespace",
+      "description": "The OpenShift Namespace where the ImageStream resides.",
+      "value": "openshift"
+    },
     {
       "name": "MEMORY_LIMIT",
       "displayName": "Memory Limit",
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
@@ -82,7 +82,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "ImageStreamTag",
-              "namespace": "openshift",
+              "namespace": "${NAMESPACE}",
               "name": "python:3.4"
             }
           }
@@ -230,6 +230,12 @@
       "required": true,
       "value": "django-example"
     },
+    {
+      "name": "NAMESPACE",
+      "displayName": "Namespace",
+      "description": "The OpenShift Namespace where the ImageStream resides.",
+      "value": "openshift"
+    },
     {
       "name": "MEMORY_LIMIT",
       "displayName": "Memory Limit",

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`	`"sourceStrategy": {`
`83`	`83`	`"from": {`
`84`	`84`	`"kind": "ImageStreamTag",`
`85`		`- "namespace": "openshift",`
	`85`	`+ "namespace": "${NAMESPACE}",`
`86`	`86`	`"name": "python:3.4"`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -266,7 +266,7 @@`
`266`	`266`	`],`
`267`	`267`	`"from": {`
`268`	`268`	`"kind": "ImageStreamTag",`
`269`		`- "namespace": "openshift",`
	`269`	`+ "namespace": "${NAMESPACE}",`
`270`	`270`	`"name": "postgresql:9.4"`
`271`	`271`	`}`
`272`	`272`	`}`
`@@ -344,6 +344,12 @@`
`344`	`344`	`"required": true,`
`345`	`345`	`"value": "django-psql-example"`
`346`	`346`	`},`
	`347`	`+ {`
	`348`	`+ "name": "NAMESPACE",`
	`349`	`+ "displayName": "Namespace",`
	`350`	`+ "description": "The OpenShift Namespace where the ImageStream resides.",`
	`351`	`+ "value": "openshift"`
	`352`	`+ },`
`347`	`353`	`{`
`348`	`354`	`"name": "MEMORY_LIMIT",`
`349`	`355`	`"displayName": "Memory Limit",`