Fix: If no volume set, use "image" type

[releng/global-jjb.git] / jenkins-admin / create_jenkins_clouds_openstack_yaml.py

diff --git a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
index b200b75..ec11f45 100755 (executable)
--- a/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
+++ b/jenkins-admin/create_jenkins_clouds_openstack_yaml.py
@@ -100,9 +100,10 @@ machinetemplate = """\
             name: {{ name_prefix }}-{{ labels }}
             slaveOptions:
               bootSource:
-                volumeFromImage:
+                {{ image_type }}:
                   name: {{ image_name }}
-                  volumeSize: {{ volume_size }}
+{%- if image_type == "volumeFromImage"  %}
+                  volumeSize: {{ volume_size }}{% endif %}
 {%- if hardware_id  %}
               hardwareId: {{ hardware_id }}{% endif %}
 {%- if instance_cap %}
@@ -202,7 +203,9 @@ for section in config_parser_merged.sections():
 
         # Default volume size of 10
         if "volume_size" not in section_all_machines:
-            section_all_machines.update(volume_size="10")
+            section_all_machines.update(image_type="image")
+        else:
+            section_all_machines.update(image_type="volumeFromImage")
         if "labels" not in section_all_machines:
             # "section" is the name of the cloud agent, which is the default label
             section_all_machines.update(labels=section)