Merge "Fix parameter mismatch in CoreOS templates"

magnum/templates/kubernetes/kubecluster-coreos.yaml

@@ -150,6 +150,23 @@ parameters:
     description: version of kubernetes used for kubernetes cluster
     default: v1.2.0
 
+  registry_enabled:
+    type: boolean
+    description: >
+      Indicates whether the docker registry is enabled.
+    default: false
+
+  registry_port:
+    type: number
+    description: port of registry service
+    default: 5000
+
+  wait_condition_timeout:
+    type: number
+    description: >
+      timeout for the Wait Conditions
+    default: 6000
+
 resources:
 
   ######################################################################
@@ -216,6 +233,7 @@ resources:
           kubernetes_port: {get_param: kubernetes_port}
           tls_disabled: {get_param: tls_disabled}
           kube_version: {get_param: kube_version}
+          wait_condition_timeout: {get_param: wait_condition_timeout}
 
   ######################################################################
   #
@@ -248,6 +266,7 @@ resources:
           tls_disabled: {get_param: tls_disabled}
           kube_version: {get_param: kube_version}
           etcd_server_ip: {"Fn::Select": [0, {get_attr: [kube_master, kube_master_ip]}]}
+          wait_condition_timeout: {get_param: wait_condition_timeout}
 
 outputs:
 

magnum/templates/kubernetes/kubemaster-coreos.yaml

@@ -28,10 +28,6 @@ parameters:
     description: >
       Discovery URL used for bootstrapping the etcd cluster.
 
-  dns_nameserver:
-    type: string
-    description: address of a dns nameserver reachable in your environment
-
   portal_network_cidr:
     type: string
     description: >

magnum/templates/kubernetes/kubeminion-coreos.yaml

@@ -68,6 +68,11 @@ parameters:
     type: string
     description: network range for flannel overlay network
 
+  wait_condition_timeout:
+    type: number
+    description: >
+      timeout for the Wait Conditions
+
 resources:
 
   minion_wait_handle:
@@ -78,7 +83,7 @@ resources:
     depends_on: kube-minion
     properties:
       handle: {get_resource: minion_wait_handle}
-      timeout: 6000
+      timeout: {get_param: wait_condition_timeout}
 
   ######################################################################
   #