Permalink
Browse files

Merge "[agent|stemcell] Fix stemcell2 builder for OpenStack images bo…

…oted on Xen"
  • Loading branch information...
2 parents 0dabbb1 + e470a5a commit 876a85b2a0b0b7d024e3779af72341d9f862c90e @frodenas frodenas committed with Gerrit Code Review Dec 22, 2012
View
9 agent/misc/stemcell/build2/stages/stemcell_openstack/apply.sh
@@ -20,9 +20,11 @@ hypervisor = "${stemcell_hypervisor:-kvm}"
case hypervisor
when "kvm"
+ container_format = "bare"
disk_format = "qcow2"
when "xen"
- disk_format = "ami"
+ container_format = "bare"
+ disk_format = "raw"
end
manifest = {
@@ -34,7 +36,10 @@ manifest = {
"version" => version,
"infrastructure" => stemcell_infrastructure,
"disk_format" => disk_format,
- "container_format" => "bare"
+ "container_format" => container_format,
+ "os_type" => "linux",
+ "architecture" => "x86_64",
+ "auto_disk_config" => "true"
}
}
View
1 agent/misc/stemcell/build2/stages/stemcell_openstack/config.sh
@@ -33,5 +33,6 @@ fi
persist_value stemcell_name
persist_value stemcell_version
persist_value stemcell_infrastructure
+persist_value stemcell_hypervisor
persist_value bosh_protocol_version
persist_value ruby_bin

0 comments on commit 876a85b

Please sign in to comment.