[k8s_ironic] Move wc out of minion resource group

This patch let kubeminions share same wait condition and wait condition
handler resource instead of create same function of resource for each
kubeminion node.
Partial-Bug: #1646720

Change-Id: I890a6f3155737286fe8930de038ba78ff7c2498c

magnum/drivers/k8s_fedora_ironic_v1/templates/kubecluster.yaml

@@ -451,7 +451,6 @@ resources:
           kube_allow_priv: {get_param: kube_allow_priv}
           docker_volume_size: {get_param: docker_volume_size}
           docker_storage_driver: {get_param: docker_storage_driver}
-          wait_condition_timeout: {get_param: wait_condition_timeout}
           registry_enabled: {get_param: registry_enabled}
           registry_port: {get_param: registry_port}
           swift_region: {get_param: swift_region}
@@ -480,6 +479,22 @@ resources:
           trust_id: {get_param: trust_id}
           auth_url: {get_param: auth_url}
           insecure_registry_url: {get_param: insecure_registry_url}
+          wc_curl_cli: {get_attr: [minion_wait_handle, curl_cli]}
+
+  ######################################################################
+  #
+  # wait condition handler for kubernetes minions
+  #
+
+  minion_wait_handle:
+    type: OS::Heat::WaitConditionHandle
+
+  minion_wait_condition:
+    type: OS::Heat::WaitCondition
+    properties:
+      count: {get_param: number_of_minions}
+      handle: {get_resource: minion_wait_handle}
+      timeout: {get_param: wait_condition_timeout}
 
 outputs:
 

magnum/drivers/k8s_fedora_ironic_v1/templates/kubeminion.yaml

@@ -85,11 +85,6 @@ parameters:
     type: string
     description: network range for flannel overlay network
 
-  wait_condition_timeout:
-    type: number
-    description : >
-      timeout for the Wait Conditions
-
   registry_enabled:
     type: boolean
     description: >
@@ -194,18 +189,13 @@ parameters:
     type: string
     description: insecure registry url
 
+  wc_curl_cli:
+    type: string
+    description : >
+      Wait condition notify command for Minion.
+
 resources:
 
-  minion_wait_handle:
-    type: OS::Heat::WaitConditionHandle
-
-  minion_wait_condition:
-    type: OS::Heat::WaitCondition
-    depends_on: kube-minion
-    properties:
-      handle: {get_resource: minion_wait_handle}
-      timeout: {get_param: wait_condition_timeout}
-
   ######################################################################
   #
   # software configs.  these are components that are combined into
@@ -246,7 +236,7 @@ resources:
             $HTTPS_PROXY: {get_param: https_proxy}
             $NO_PROXY: {get_param: no_proxy}
             $KUBE_VERSION: {get_param: kube_version}
-            $WAIT_CURL: {get_attr: [minion_wait_handle, curl_cli]}
+            $WAIT_CURL: {get_param: wc_curl_cli}
             $TRUSTEE_DOMAIN_ID: {get_param: trustee_domain_id}
             $TRUSTEE_USER_ID: {get_param: trustee_user_id}
             $TRUSTEE_USERNAME: {get_param: trustee_username}
@@ -330,7 +320,7 @@ resources:
             #!/bin/bash -v
             wc_notify --data-binary '{"status": "SUCCESS"}'
           params:
-            wc_notify: {get_attr: [minion_wait_handle, curl_cli]}
+            wc_notify: {get_param: wc_curl_cli}
 
   disable_selinux:
     type: OS::Heat::SoftwareConfig