From 38a3c879a589d8f73d7912e8fc2f64d7b8c667c0 Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Fri, 5 Jun 2020 15:23:33 +0000
Subject: [PATCH] Revert "Change the order of resource creation"

This reverts commit 18be349d4a275aadcb3df11f03d06b0dd2c4c633.

It leads to a circular dependency error in Stein therefore incompatible.

Error waiting for openstack_containerinfra_cluster_v1
14807cc0-52e6-4c72-9128-aa61ddd4ba6d to become ready:
openstack_containerinfra_cluster_v1 is in an error state: ERROR:
CircularDependencyException: :
resources.kube_masters<nested_stack>.resources.0<file:///usr/lib/python2.7/site-packages/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml>:
: Circular Dependency Found: {NoneResource "etcd_volume_attach": {Server
"kube-master"}, Server "kube-master": {MultipartMime
"kube_master_init"}, NoneResource "docker_volume_attach": {Server
"kube-master"}, TemplateResource "api_address_switch": {NoneResource
"kube_master_floating"}, MultipartMime "kube_master_init":
{SoftwareConfig "write_heat_params"}, SoftwareConfig
"write_heat_params": {NoneResource "kube_master_floating",
TemplateResource "api_address_switch"}, NoneResource
"kube_master_floating": {Server "kube-master"}}

Change-Id: I00f36aa03352bff19ebecac9fa9d078f33abd39e
---
 magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml | 1 -
 magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
index dd16ed30ba..b6b98d7dc6 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
@@ -725,7 +725,6 @@ resources:
     properties:
       floating_network: {get_param: external_network}
       port_id: {get_resource: kube_master_eth0}
-    depends_on: kube-master
 
   api_pool_member:
     type: Magnum::Optional::Neutron::LBaaS::PoolMember
diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
index 90ca58bf2f..928d79ecb2 100644
--- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
+++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
@@ -509,7 +509,6 @@ resources:
     properties:
       floating_network: {get_param: external_network}
       port_id: {get_resource: kube_minion_eth0}
-    depends_on: kube-minion
 
   ######################################################################
   #