lib/bosh/stemcell/builder_options.rb in bosh-stemcell-1.2121.0 vs lib/bosh/stemcell/builder_options.rb in bosh-stemcell-1.2124.0

@@ -33,11 +33,11 @@
         'ruby_bin' => ruby_bin,
         'bosh_release_src_dir' => File.join(source_root, 'release/src/bosh'),
         'bosh_agent_src_dir' => File.join(source_root, 'bosh_agent'),
         'go_agent_src_dir' => File.join(source_root, 'go_agent'),
         'image_create_disk_size' => image_create_disk_size
-      }.merge(bosh_micro_options).merge(environment_variables).merge(vsphere_options)
+      }.merge(bosh_micro_options).merge(environment_variables).merge(ovf_options)
     end
 
     private
 
     def_delegators(
@@ -53,12 +53,12 @@
       :definition,
       :image_create_disk_size,
       :bosh_micro_release_tgz_path
     )
 
-    def vsphere_options
-      if infrastructure.name == 'vsphere'
-        { 'image_vsphere_ovf_ovftool_path' => environment['OVFTOOL'] }
+    def ovf_options
+      if infrastructure.name == 'vsphere' || infrastructure.name == 'vcloud'
+        { 'image_ovftool_path' => environment['OVFTOOL'] }
       else
         {}
       end
     end