The WaitConditionHandle resource of swarm is repeated

[PanFengyun]

The master_wait_handle and cloud_init_wait_handle are the same, the node_agent_wait_handle and node_cloud_init_wait_handle are the same. We just need only one,and there is no need to create two resources of OS::Heat::WaitConditionHandle. Heat will wait for all of the conditions to return, so one is enough.
To converge more with k8s templates, we should use master_wait_handle instead of cloud_init_wait_handle and use node_agent_wait_handle instead of node_cloud_init_wait_handle.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/342854
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=1b3ab819ef102a1c634f787f579ad871ef31461d
Submitter: Jenkins
Branch: master

commit 1b3ab819ef102a1c634f787f579ad871ef31461d
Author: PanFengyun <email address hidden>
Date: Mon Jul 18 21:30:21 2016 +0800

    Remove repeated WaitConditionHandle resource

    The master_wait_handle and cloud_init_wait_handle are the same,
    the node_agent_wait_handle and node_cloud_init_wait_handle are
    the same. We just need only one. To converge more with k8s
    templates, we should use master_wait_handle instead of
    cloud_init_wait_handle and use node_agent_wait_handle instead of
    node_cloud_init_wait_handle.

    Change-Id: Icc07ef8407c05ef37a35c7f418c11c562572cab5
    Closes-Bug: #1603999

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 3.0.0 release.