openstack
/
magnum
Code Issues Proposed changes

Merge "bug: cluster creation without docker_volume_size"

This commit is contained in:
Zuul 2019-12-08 09:36:34 +00:00 committed by Gerrit Code Review
parent 7931f6258e 612b227776
commit ef061ce86f
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/drivers/heat/k8s_fedora_template_def.py
View File

@ -177,10 +177,11 @@ class K8sFedoraTemplateDefinition(k8s_template_def.K8sTemplateDefinition):
def _set_volumes(self, context, cluster, extra_params):
# set docker_volume_type
docker_volume_size = cluster.docker_volume_size or 0
docker_volume_type = (cluster.labels.get(
'docker_volume_type',
cinder.get_default_docker_volume_type(context))
if int(cluster.docker_volume_size) > 0 else '')
if int(docker_volume_size) > 0 else '')
extra_params['docker_volume_type'] = docker_volume_type
# set etcd_volume_type