diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
index 735179830a..f24c0ff251 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/kubecluster.yaml
@@ -23,16 +23,16 @@ parameters:
   master_flavor:
     type: string
     default: m1.small
-    description: flavor to use when booting the server
+    description: flavor to use when booting the server for master nodes
 
   minion_flavor:
     type: string
     default: m1.small
-    description: flavor to use when booting the server
+    description: flavor to use when booting the server for minions
 
   dns_nameserver:
     type: string
-    description: address of a dns nameserver reachable in your environment
+    description: address of a DNS nameserver reachable in your environment
     default: 8.8.8.8
 
   number_of_masters:
@@ -483,8 +483,8 @@ outputs:
         params:
           api_ip_address: {get_attr: [api_pool_floating, floating_ip_address]}
     description: >
-      This is the API endpoint of the Kubernetes server. Use this to access
-      the Kubernetes API from outside the cluster.
+      This is the API endpoint of the Kubernetes cluster. Use this to access
+      the Kubernetes API.
 
   registry_address:
     value:
@@ -499,16 +499,16 @@ outputs:
   kube_masters:
     value: {get_attr: [kube_masters, kube_master_external_ip]}
     description: >
-      This is a list of "public" ip addresses of all Kubernetes master servers.
-      Use these addresses to log in to the Kubernetes masters via ssh.
+      This is a list of the "public" IP addresses of all the Kubernetes masters.
+      Use these IP addresses to log in to the Kubernetes masters via ssh.
 
   kube_minions:
     value: {get_attr: [kube_minions, kube_minion_ip]}
     description: >
-      This is a list of the "private" addresses of all the Kubernetes minions.
+      This is a list of the "private" IP addresses of all the Kubernetes minions.
 
   kube_minions_external:
     value: {get_attr: [kube_minions, kube_minion_external_ip]}
     description: >
-      This is a list of the "public" addresses of all the Kubernetes minions. Use
-      these addresses to, e.g., log into the minions.
+      This is a list of the "public" IP addresses of all the Kubernetes minions.
+      Use these IP addresses to log in to the Kubernetes minions via ssh.
diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
index fe327504d0..1bec69ec8b 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/kubemaster.yaml
@@ -81,7 +81,6 @@ parameters:
     type: string
     description: endpoint to retrieve TLS certs from
 
-  # The following are all generated in the parent template.
   api_public_address:
     type: string
     description: Public IP address of the Kubernetes master server.
@@ -91,40 +90,51 @@ parameters:
   fixed_network:
     type: string
     description: Network from which to allocate fixed addresses.
+
   fixed_subnet:
     type: string
     description: Subnet from which to allocate fixed addresses.
+
   network_driver:
     type: string
     description: network driver to use for instantiating container networks
+
   wait_condition_timeout:
     type: number
     description : >
       timeout for the Wait Conditions
+
   secgroup_base_id:
     type: string
     description: ID of the security group for base.
+
   secgroup_kube_master_id:
     type: string
     description: ID of the security group for kubernetes master.
+
   api_pool_id:
     type: string
     description: ID of the load balancer pool of k8s API server.
+
   etcd_pool_id:
     type: string
     description: ID of the load balancer pool of etcd server.
+
   auth_url:
     type: string
     description: >
-      url for kubernetes to authenticate before sending request to neutron
+      url for kubernetes to authenticate
+
   username:
     type: string
     description: >
       user account
+
   password:
     type: string
     description: >
       user password
+
   tenant_name:
     type: string
     description: >
@@ -275,6 +285,10 @@ outputs:
 
   kube_master_ip:
     value: {get_attr: [kube_master_eth0, fixed_ips, 0, ip_address]}
+    description: >
+      This is the "private" IP address of the Kubernetes master node.
 
   kube_master_external_ip:
     value: {get_attr: [kube_master_floating, floating_ip_address]}
+    description: >
+      This is the "public" IP address of the Kubernetes master node.
diff --git a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml
index 762b910590..42f9daf889 100644
--- a/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml
+++ b/contrib/drivers/k8s_opensuse_v1/templates/kubeminion.yaml
@@ -60,20 +60,22 @@ parameters:
     type: string
     description: endpoint to retrieve TLS certs from
 
-
-  # The following are all generated in the parent template.
   kube_master_ip:
     type: string
     description: IP address of the Kubernetes master server.
+
   etcd_server_ip:
     type: string
     description: IP address of the Etcd server.
+
   fixed_network:
     type: string
     description: Network from which to allocate fixed addresses.
+
   fixed_subnet:
     type: string
     description: Subnet from which to allocate fixed addresses.
+
   network_driver:
     type: string
     description: network driver to use for instantiating container networks
@@ -305,9 +307,15 @@ outputs:
 
   kube_minion_ip:
     value: {get_attr: [kube_minion_eth0, fixed_ips, 0, ip_address]}
+    description: >
+      This is the "public" IP address of the Kubernetes minion node.
 
   kube_minion_external_ip:
     value: {get_attr: [kube_minion_floating, floating_ip_address]}
+    description: >
+      This is the "public" IP address of the Kubernetes minion node.
 
   OS::stack_id:
     value: {get_param: "OS::stack_id"}
+    description: >
+      This is a id of the stack which creates from this template.