From 2c63aca8c6afbcc2e32a09cc7f3ad2f18265698f Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 26 Aug 2020 20:51:03 -0400 Subject: [PATCH] Stop using delete_on_termination for BFV instances When using delete_on_termination and the booting of the instance fails on the first attempt, the second attempt will fail with Heat. The reason is that with delete_on_termination set to True, Nova will delete the volume when Heat deletes the ERROR'd instance and it will then result in the follow-up boot to fail with an error along the line of unable to find volume, which masks the real failure from the user (which could potentialy be aquota issue). With this patch, we no longer set this and instead use the default of false. This will not mean we will leak volumes because when we delete the stack, Heat will do all the right things and delete them in order, making sure the volume disappears eventually. Change-Id: I362cea7bf57825035d13d234d0181a2b1fca5743 --- magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml | 1 - magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml | 1 - magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml | 1 - magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index 7e42049339..3aea250151 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -910,7 +910,6 @@ resources: block_device_mapping_v2: - boot_index: 0 volume_id: {get_resource: kube_node_volume} - delete_on_termination: true kube_master_eth0: type: OS::Neutron::Port diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index 69c8216ece..32ff41effc 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -533,7 +533,6 @@ resources: block_device_mapping_v2: - boot_index: 0 volume_id: {get_resource: kube_node_volume} - delete_on_termination: true kube_minion_eth0: type: OS::Neutron::Port diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml index f18ae92f17..4ee303358e 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml @@ -920,7 +920,6 @@ resources: block_device_mapping_v2: - boot_index: 0 volume_id: {get_resource: kube_node_volume} - delete_on_termination: true kube_master_eth0: type: OS::Neutron::Port diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml index 209da65eb1..1e34d80a24 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml @@ -548,7 +548,6 @@ resources: block_device_mapping_v2: - boot_index: 0 volume_id: {get_resource: kube_node_volume} - delete_on_termination: true kube_minion_eth0: type: OS::Neutron::Port