lib/bosh/stemcell/builder_options.rb in bosh-stemcell-1.2824.0 vs lib/bosh/stemcell/builder_options.rb in bosh-stemcell-1.2827.0
- old
+ new
@@ -16,12 +16,10 @@
@os_image_tgz_path = dependencies.fetch(:os_image_tarball)
end
def default
{
- '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,
@@ -32,10 +30,14 @@
'image_create_disk_size' => image_create_disk_size,
'os_image_tgz' => os_image_tgz_path,
}.merge(bosh_micro_options).merge(environment_variables).merge(ovf_options)
end
+ attr_reader(
+ :stemcell_version,
+ )
+
private
def_delegators(
:@definition,
:infrastructure,
@@ -43,11 +45,10 @@
:agent,
)
attr_reader(
:environment,
- :stemcell_version,
:definition,
:image_create_disk_size,
:bosh_micro_release_tgz_path,
:os_image_tgz_path,
)
@@ -72,13 +73,9 @@
'bosh_micro_enabled' => 'yes',
'bosh_micro_package_compiler_path' => File.join(source_root, 'bosh-release'),
'bosh_micro_manifest_yml_path' => File.join(source_root, 'release', 'micro', "#{infrastructure.name}.yml"),
'bosh_micro_release_tgz_path' => bosh_micro_release_tgz_path,
}
- end
-
- def archive_filename
- ArchiveFilename.new(stemcell_version, definition, 'bosh-stemcell')
end
def stemcell_image_name
"#{infrastructure.name}-#{infrastructure.hypervisor}-#{operating_system.name}.raw"
end