[k8s] Fix docker volume issue

Though user has set the docker_volume_size in cluster template, the
docker volume won't be created if docker_volume_size not set when
creating cluster. It's because Magnum API failed to set it for this
scenario.

Task: 23301
Story: 2003165

Change-Id: Ic590731b36186ccf2e3a81873505864aaaef7563
This commit is contained in:
Feilong Wang 2018-07-31 10:22:57 +12:00
parent 0bf72ba164
commit 253591522c
1 changed files with 2 additions and 1 deletions

View File

@ -448,7 +448,8 @@ class ClustersController(base.Controller):
cluster.keypair = cluster_template.keypair_id
# If docker_volume_size is not present, use cluster_template value
if cluster.docker_volume_size == wtypes.Unset:
if (cluster.docker_volume_size == wtypes.Unset or
not cluster.docker_volume_size):
cluster.docker_volume_size = cluster_template.docker_volume_size
# If labels is not present, use cluster_template value