openstack
/
magnum
Code Issues Proposed changes

Merge "[k8s] Fix docker volume issue"

This commit is contained in:
Zuul 2018-08-13 01:28:01 +00:00 committed by Gerrit Code Review
parent e6aef9d15c 253591522c
commit 934f308c0b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnum/api/controllers/v1/cluster.py
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