Merge pull request #368 from lpabon/heketi_template

Update templates
heketi · Jun 2, 2016 · 01b1da2 · 01b1da2
2 parents 2e3e5c1 + a5ba076
commit 01b1da2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/extras/openshift/template/glusterfs-template.json b/extras/openshift/template/glusterfs-template.json
@@ -16,7 +16,7 @@
             "kind": "DeploymentConfig",
             "apiVersion": "v1",
             "metadata": {
-                "name": "glusterfs-${NODE_LABEL}",
+                "name": "glusterfs-${NODE_GLUSTERFSID}",
                 "annotations": {
                     "description": "Deploys the GlusterFS container"
                 }
@@ -31,7 +31,7 @@
                         "name": "glusterfs",
                         "labels": {
                             "name": "glusterfs",
-                            "glusterfsid": "${NODE_LABEL}"
+                            "glusterfsid": "${NODE_GLUSTERFSID}"
                         }
                     },
                     "triggers": [
@@ -44,7 +44,7 @@
                     },
                     "spec": {
                         "nodeSelector": {
-                            "name": "${NODE_LABEL}"
+                            "glusterfsid": "${NODE_GLUSTERFSID}"
                         },
                         "hostNetwork": true,
                         "containers": [
@@ -152,9 +152,9 @@
     ],
     "parameters": [
         {
-            "name": "NODE_LABEL",
-            "displayName": "Node label",
-            "description": "Label of storage node which will run the container",
+            "name": "NODE_GLUSTERFSID",
+            "displayName": "Node tag for label glusterfsid",
+            "description": "Tag of storage node for label glusterfsid which will run the container",
             "required": true
         }
     ]

diff --git a/extras/openshift/template/heketi-template.json b/extras/openshift/template/heketi-template.json
@@ -162,31 +162,37 @@
     },
     {
       "name": "HEKETI_KUBE_CERTFILE",
-      "description": "SSL certificate file accessiable from the container"
+      "displayName": "Certificate file",
+      "description": "Container path to Kubernetes certificate file"
     },
     {
       "name": "HEKETI_KUBE_INSECURE",
+      "displayName": "Insecure access",
       "description": "Allow insecure SSL/HTTPS access",
       "value": "n"
     },
     {
       "name": "HEKETI_KUBE_USER",
-      "description": "OpenShift username to access Kubernetes API",
+      "displayName": "User",
+      "description": "OpenShift/Kubernetes username to access Kubernetes API",
       "required": true
     },
     {
       "name": "HEKETI_KUBE_PASSWORD",
+      "displayName": "Password",
       "description": "Password for OpenShift user",
       "required": true
     },
     {
       "name": "HEKETI_KUBE_NAMESPACE",
+      "displayName": "Project/Namespace",
       "description": "OpenShift project or Kubernetes namespace containing GlusterFS",
       "required": true
     },
     {
       "name": "HEKETI_KUBE_APIHOST",
-      "description": "Kubernetes API host",
+      "displayName": "API Host Address",
+      "description": "Kubernetes API host, for example: https://ip:port",
       "required": true
     }
   ]