openstack/magnum
Code Issues Proposed changes

Merge "[k8s] Fix volumes availability zone issue"

Browse Source
This commit is contained in:
Zuul 2020-01-27 21:42:13 +00:00 committed by Gerrit Code Review
commit 454b0f55ec
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml
View File

@ -780,6 +780,7 @@ resources:
image: {get_param: server_image}
size: {get_param: boot_volume_size}
volume_type: {get_param: boot_volume_type}
availability_zone: {get_param: availability_zone}
# do NOT use "_" (underscore) in the Nova server name
# it creates a mismatch between the generated Nova name and its hostname
@ -865,6 +866,7 @@ resources:
properties:
size: {get_param: etcd_volume_size}
volume_type: {get_param: etcd_volume_type}
availability_zone: {get_param: availability_zone}
etcd_volume_attach:
type: Magnum::Optional::Etcd::VolumeAttachment
@ -884,6 +886,7 @@ resources:
properties:
size: {get_param: docker_volume_size}
volume_type: {get_param: docker_volume_type}
availability_zone: {get_param: availability_zone}
docker_volume_attach:
type: Magnum::Optional::Cinder::VolumeAttachment

2
magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml
View File

@ -464,6 +464,7 @@ resources:
image: {get_param: server_image}
size: {get_param: boot_volume_size}
volume_type: {get_param: boot_volume_type}
availability_zone: {get_param: availability_zone}
# do NOT use "_" (underscore) in the Nova server name
# it creates a mismatch between the generated Nova name and its hostname
@ -533,6 +534,7 @@ resources:
properties:
size: {get_param: docker_volume_size}
volume_type: {get_param: docker_volume_type}
availability_zone: {get_param: availability_zone}
docker_volume_attach:
type: Magnum::Optional::Cinder::VolumeAttachment

3
magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
View File

@ -790,6 +790,7 @@ resources:
image: {get_param: server_image}
size: {get_param: boot_volume_size}
volume_type: {get_param: boot_volume_type}
availability_zone: {get_param: availability_zone}
# do NOT use "_" (underscore) in the Nova server name
# it creates a mismatch between the generated Nova name and its hostname
@ -873,6 +874,7 @@ resources:
properties:
size: {get_param: etcd_volume_size}
volume_type: {get_param: etcd_volume_type}
availability_zone: {get_param: availability_zone}
etcd_volume_attach:
type: Magnum::Optional::Etcd::VolumeAttachment
@ -892,6 +894,7 @@ resources:
properties:
size: {get_param: docker_volume_size}
volume_type: {get_param: docker_volume_type}
availability_zone: {get_param: availability_zone}
docker_volume_attach:
type: Magnum::Optional::Cinder::VolumeAttachment

2
magnum/drivers/k8s_fedora_coreos_v1/templates/kubeminion.yaml
View File

@ -465,6 +465,7 @@ resources:
image: {get_param: server_image}
size: {get_param: boot_volume_size}
volume_type: {get_param: boot_volume_type}
availability_zone: {get_param: availability_zone}
# do NOT use "_" (underscore) in the Nova server name
# it creates a mismatch between the generated Nova name and its hostname
@ -532,6 +533,7 @@ resources:
properties:
size: {get_param: docker_volume_size}
volume_type: {get_param: docker_volume_type}
availability_zone: {get_param: availability_zone}
docker_volume_attach:
type: Magnum::Optional::Cinder::VolumeAttachment

9
releasenotes/notes/k8s-volumes-az-fix-85ad48998d2c12aa.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
In a multi availability zone (AZ) environment, if Nova doesn't support
cross AZ volume mount, then the cluster creation may fail because Nova can
not mount volume in different AZ. This issue only impact Fedora Atomic and
Fedora CoreOS drivers. Now this issue is fixed by passing in the AZ info
when creating volumes.