builder_options.rb in bosh-stemcell-1.2446.0

- old
+ new

@@ -17,20 +17,18 @@
       @bosh_micro_release_tgz_path = dependencies.fetch(:release_tarball)
       @os_image_tgz_path = dependencies.fetch(:os_image_tarball)
     end
 
     def default
-      stemcell_name = "bosh-#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}"
-      stemcell_name += "-#{agent.name}_agent" unless agent.name == 'ruby'
-
       {
-        'stemcell_name' => stemcell_name,
+        'stemcell_name' => "bosh-#{@definition.stemcell_name}",
         'stemcell_tgz' => archive_filename.to_s,
         'stemcell_image_name' => stemcell_image_name,
         'stemcell_version' => stemcell_version,
         'stemcell_hypervisor' => infrastructure.hypervisor,
         'stemcell_infrastructure' => infrastructure.name,
         'stemcell_operating_system' => operating_system.name,
+        'stemcell_operating_system_version' => operating_system.version,
         'bosh_protocol_version' => Bosh::Agent::BOSH_PROTOCOL,
         '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'),