Merge "[k8s] Fix docker volume issue"

5 years ago · 934f308c0b
parent e6aef9d15c 253591522c
commit 934f308c0b
1 changed files with 2 additions and 1 deletions
--- a/magnum/api/controllers/v1/cluster.py
+++ b/magnum/api/controllers/v1/cluster.py
@ -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